diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81df51582c4dec03b95296ea3e2fce69e971ff7d..dcf90e78d1dd3aef0c928998d9af6823a51e506c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,11 +53,6 @@ build-coq.8.9.1: variables: OPAM_PINS: "coq version 8.9.1" -build-coq.8.8.2: - <<: *template - variables: - OPAM_PINS: "coq version 8.8.2" - # Nightly job with a known-to-work Coq version build-stdpp.dev-coq.8.11.0: <<: *template diff --git a/README.md b/README.md index a824be3993f8c0388249952fe854facba6db48bd..ee99265aa5162297ea086a60752792e56252c1a1 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,11 @@ definitions and some derived forms is available in This version is known to compile with: - - Coq 8.8.2 / 8.9.1 / 8.10.2 / 8.11.0 + - Coq 8.9.1 / 8.10.2 / 8.11.0 - A development version of [std++](https://gitlab.mpi-sws.org/iris/stdpp) -For a version compatible with Coq 8.6, have a look at the -[iris-3.1 branch](https://gitlab.mpi-sws.org/iris/iris/tree/iris-3.1). -If you need to work with Coq 8.5, please check out the -[iris-3.0 branch](https://gitlab.mpi-sws.org/iris/iris/tree/iris-3.0). +If you need to work with Coq 8.7 or Coq 8.8, please check out the +[iris-3.2 branch](https://gitlab.mpi-sws.org/iris/iris/tree/iris-3.2). ### Working *with* Iris diff --git a/_CoqProject b/_CoqProject index 7cf7c6a7071d73866034fc41e941db2f31955804..900568c5eac3877854e6f7d9ea9a896536c66b9a 100644 --- a/_CoqProject +++ b/_CoqProject @@ -8,7 +8,7 @@ -arg -w -arg -convert_concl_no_check # "Declare Scope" does not exist yet in 8.9. -arg -w -arg -undeclared-scope -# We have ambiguous paths and so far it is not even clear what they are (https://gitlab.mpi-sws.org/iris/iris/issues/240). +# We have ambiguous paths, and live with it. -arg -w -arg -ambiguous-paths theories/algebra/monoid.v diff --git a/opam b/opam index 6847c719225099c000075ed43726c1ca4e4782fc..af6299e986ac15137dc1c16066b90147ed92aade 100644 --- a/opam +++ b/opam @@ -10,7 +10,7 @@ dev-repo: "git+https://gitlab.mpi-sws.org/iris/iris.git" synopsis: "This is the Coq development of the Iris Project" depends: [ - "coq" { (= "8.8.2") | (>= "8.9.1" & < "8.12~") | (= "dev") } + "coq" { (>= "8.9.1" & < "8.12~") | (= "dev") } "coq-stdpp" { (= "dev.2020-02-24.1.7d705c84") | (= "dev") } ]