diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c9ecb701a0cacd421969f950aea33019b48cd8d..ecca27d5a9c83a41f7029cc949f0a84adf3fbe23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,11 +34,17 @@ build-coq.dev: OPAM_PINS: "coq version dev" CI_COQCHK: "1" -build-coq.8.10.dev: +build-coq.8.10.1: <<: *template variables: OCAML: "ocaml-base-compiler.4.07.0" - OPAM_PINS: "coq version 8.10.dev" + OPAM_PINS: "coq version 8.10.1" + +build-coq.8.10.0: + <<: *template + variables: + OCAML: "ocaml-base-compiler.4.07.0" + OPAM_PINS: "coq version 8.10.0" build-coq.8.9.1: <<: *template @@ -60,8 +66,3 @@ build-coq.8.8.2: <<: *template variables: OPAM_PINS: "coq version 8.8.2" - -build-coq.8.7.2: - <<: *template - variables: - OPAM_PINS: "coq version 8.7.2" diff --git a/README.md b/README.md index 234aae22fd2165da5ccbe6500ff1f051fd0d8075..fa1931c7b7d75ef804806b4062c0378f7f71699b 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ definitions and some derived forms is available in This version is known to compile with: - - Coq 8.7.2 / 8.8.2 / 8.9.0 / 8.9.1 + - Coq 8.8.2 / 8.9.0 / 8.9.1 / 8.10.0 / 8.10.1 - 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 diff --git a/opam b/opam index c6500e169962bb9bbc991e98cb86bbf58b183fb7..52aa2d9ee354384f5cb5701d1c00fa14e55a25d5 100644 --- a/opam +++ b/opam @@ -11,6 +11,6 @@ build: [make "-j%{jobs}%"] install: [make "install"] remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/iris"] depends: [ - "coq" { (= "8.7.2") | (= "8.8.2") | (>= "8.9" & < "8.12~") | (= "dev") } + "coq" { (= "8.8.2") | (>= "8.9" & < "8.12~") | (= "dev") } "coq-stdpp" { (= "dev.2019-10-07.0.e35c9837") | (= "dev") } ] diff --git a/theories/algebra/ofe.v b/theories/algebra/ofe.v index f9c7de6c2e47afe64e44a400dfbdf5334851caa0..1454393e0fecb3d6c9c4ac938159bb6c69071ca9 100644 --- a/theories/algebra/ofe.v +++ b/theories/algebra/ofe.v @@ -1507,9 +1507,5 @@ Section sigTOF. End sigTOF. Arguments sigTOF {_} _%OF. -(* -FIXME: Notation disabled because it causes strange conflicts in Coq 8.7. -Enable again once we drop support for that version. Notation "{ x & P }" := (sigTOF (λ x, P%OF)) : oFunctor_scope. Notation "{ x : A & P }" := (@sigTOF A%type (λ x, P%OF)) : oFunctor_scope. -*)