diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54186ef60c931bcb5f613f6843e0120a095b80e2..976d5147ba7b96f6f5b39052953260335c10005f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: variables: CPU_CORES: "10" - OCAML: "ocaml-base-compiler.4.14.0" + OCAML: "ocaml-variants.4.14.0+options ocaml-option-flambda" .only_branches: &only_branches only: @@ -42,19 +42,12 @@ variables: ## Build jobs -build-coq.8.15.0: +build-coq.8.15.1: <<: *template variables: - OPAM_PINS: "coq version 8.15.0" + OPAM_PINS: "coq version 8.15.1" DENY_WARNINGS: "1" MANGLE_NAMES: "1" - -build-coq.8.14.1: - <<: *template - variables: - OPAM_PINS: "coq version 8.14.1" - MANGLE_NAMES: "1" - DENY_WARNINGS: "1" OPAM_PKG: "1" DOC_DIR: "coqdoc@center.mpi-sws.org:iris" DOC_OPTS: "--external https://plv.mpi-sws.org/coqdoc/stdpp/ stdpp" @@ -62,14 +55,14 @@ build-coq.8.14.1: - fp-timing interruptible: false -# Separate MR job that does not run on fp-timing. -build-coq.8.14.1-mr: +build-coq.8.14.1: <<: *template - <<: *only_mr + <<: *branches_and_mr variables: OPAM_PINS: "coq version 8.14.1" MANGLE_NAMES: "1" DENY_WARNINGS: "1" + OCAML: "ocaml-base-compiler.4.07.1" build-coq.8.13.2: <<: *template @@ -77,14 +70,15 @@ build-coq.8.13.2: variables: OPAM_PINS: "coq version 8.13.2" DENY_WARNINGS: "1" + OCAML: "ocaml-base-compiler.4.07.1" # Nightly job with a known-to-work Coq version # (so failures must be caused by std++) -trigger-stdpp.dev-coq.8.14.1: +trigger-stdpp.dev-coq.8.15.1: <<: *template variables: STDPP_REPO: "iris/stdpp" - OPAM_PINS: "coq version 8.14.1 git+https://gitlab.mpi-sws.org/$STDPP_REPO#$STDPP_REV" + OPAM_PINS: "coq version 8.15.1 git+https://gitlab.mpi-sws.org/$STDPP_REPO#$STDPP_REV" except: only: - triggers diff --git a/README.md b/README.md index 16381ca1b9cfc3631147d731aa8d16b7afde4006..80570b58a605007ddff6e89cdc55bfbe43346ee2 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Importing Iris has some side effects as the library sets some global options. This version is known to compile with: - - Coq 8.13.2 / 8.14.1 / 8.15.0 + - Coq 8.13.2 / 8.14.1 / 8.15.1 - A development version of [std++](https://gitlab.mpi-sws.org/iris/stdpp) If you need to work with older versions of Coq, you can check out the