Merge pull request #12 from coq-community/mathcomp-1.15

Update CI with mathcomp 1.15
coq-community · Jul 26, 2022 · edb4131 · edb4131
2 parents 74133fe + ee9b95a
commit edb4131
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/docker-action.yml b/.github/workflows/docker-action.yml
@@ -1,3 +1,5 @@
+# This file was generated from `meta.yml`, please do not edit manually.
+# Follow the instructions on https://github.com/coq-community/templates to regenerate.
 name: Docker CI
 
 on:
@@ -16,11 +18,13 @@ jobs:
       matrix:
         image:
           - 'mathcomp/mathcomp-dev:coq-dev'
+          - 'mathcomp/mathcomp-dev:coq-8.16'
           - 'mathcomp/mathcomp-dev:coq-8.15'
           - 'mathcomp/mathcomp-dev:coq-8.14'
           - 'mathcomp/mathcomp-dev:coq-8.13'
-          - 'mathcomp/mathcomp-dev:coq-8.12'
-          - 'mathcomp/mathcomp-dev:coq-8.11'
+          - 'mathcomp/mathcomp:1.15.0-coq-8.16'
+          - 'mathcomp/mathcomp:1.15.0-coq-8.15'
+          - 'mathcomp/mathcomp:1.15.0-coq-8.14'
           - 'mathcomp/mathcomp:1.14.0-coq-8.15'
           - 'mathcomp/mathcomp:1.14.0-coq-8.14'
           - 'mathcomp/mathcomp:1.13.0-coq-8.14'

diff --git a/coq-gaia-numbers.opam b/coq-gaia-numbers.opam
@@ -15,8 +15,8 @@ Elements of Mathematics in Coq using the Mathematical Components library."""
 build: ["dune" "build" "-p" name "-j" jobs]
 depends: [
   "dune" {>= "2.5"}
-  "coq" {(>= "8.10" & < "8.16~") | (= "dev")}
-  "coq-mathcomp-ssreflect" {(>= "1.12.0" & < "1.15~") | (= "dev")}
+  "coq" {(>= "8.10" & < "8.17~") | (= "dev")}
+  "coq-mathcomp-ssreflect" {(>= "1.12.0" & < "1.16~") | (= "dev")}
   "coq-mathcomp-algebra"
   "coq-gaia-theory-of-sets" {= version}
   "coq-gaia-ordinals" {= version}

diff --git a/coq-gaia-ordinals.opam b/coq-gaia-ordinals.opam
@@ -15,8 +15,8 @@ the Mathematical Components library."""
 build: ["dune" "build" "-p" name "-j" jobs]
 depends: [
   "dune" {>= "2.5"}
-  "coq" {(>= "8.10" & < "8.16~") | (= "dev")}
-  "coq-mathcomp-ssreflect" {(>= "1.12.0" & < "1.15~") | (= "dev")}
+  "coq" {(>= "8.10" & < "8.17~") | (= "dev")}
+  "coq-mathcomp-ssreflect" {(>= "1.12.0" & < "1.16~") | (= "dev")}
   "coq-gaia-theory-of-sets" {= version}
   "coq-gaia-schutte" {= version}
 ]

diff --git a/coq-gaia-schutte.opam b/coq-gaia-schutte.opam
@@ -15,8 +15,8 @@ following the approaches of Schütte and Ackermann."""
 build: ["dune" "build" "-p" name "-j" jobs]
 depends: [
   "dune" {>= "2.5"}
-  "coq" {(>= "8.10" & < "8.16~") | (= "dev")}
-  "coq-mathcomp-ssreflect" {(>= "1.12.0" & < "1.15~") | (= "dev")}
+  "coq" {(>= "8.10" & < "8.17~") | (= "dev")}
+  "coq-mathcomp-ssreflect" {(>= "1.12.0" & < "1.16~") | (= "dev")}
 ]
 
 tags: [

diff --git a/coq-gaia-stern.opam b/coq-gaia-stern.opam
@@ -15,8 +15,8 @@ Mathematical Components library."""
 build: ["dune" "build" "-p" name "-j" jobs]
 depends: [
   "dune" {>= "2.5"}
-  "coq" {(>= "8.10" & < "8.16~") | (= "dev")}
-  "coq-mathcomp-ssreflect" {(>= "1.12.0" & < "1.15~") | (= "dev")}
+  "coq" {(>= "8.10" & < "8.17~") | (= "dev")}
+  "coq-mathcomp-ssreflect" {(>= "1.12.0" & < "1.16~") | (= "dev")}
   "coq-mathcomp-algebra"
 ]
 

diff --git a/coq-gaia-theory-of-sets.opam b/coq-gaia-theory-of-sets.opam
@@ -15,8 +15,8 @@ Elements of Mathematics in Coq using the Mathematical Components library."""
 build: ["dune" "build" "-p" name "-j" jobs]
 depends: [
   "dune" {>= "2.5"}
-  "coq" {(>= "8.10" & < "8.16~") | (= "dev")}
-  "coq-mathcomp-ssreflect" {(>= "1.12.0" & < "1.15~") | (= "dev")}
+  "coq" {(>= "8.10" & < "8.17~") | (= "dev")}
+  "coq-mathcomp-ssreflect" {(>= "1.12.0" & < "1.16~") | (= "dev")}
 ]
 
 tags: [

diff --git a/meta.yml b/meta.yml
@@ -62,12 +62,12 @@ license:
 
 supported_coq_versions:
   text: '8.10 or later'
-  opam: '{(>= "8.10" & < "8.16~") | (= "dev")}'
+  opam: '{(>= "8.10" & < "8.17~") | (= "dev")}'
 
 dependencies:
 - opam:
     name: coq-mathcomp-ssreflect
-    version: '{(>= "1.12.0" & < "1.15~") | (= "dev")}'
+    version: '{(>= "1.12.0" & < "1.16~") | (= "dev")}'
   description: |-
     [MathComp ssreflect 1.12 or later](https://math-comp.github.io)
 - opam:
@@ -78,16 +78,20 @@ dependencies:
 tested_coq_opam_versions:
 - version: 'coq-dev'
   repo: 'mathcomp/mathcomp-dev'
+- version: 'coq-8.16'
+  repo: 'mathcomp/mathcomp-dev'
 - version: 'coq-8.15'
   repo: 'mathcomp/mathcomp-dev'
 - version: 'coq-8.14'
   repo: 'mathcomp/mathcomp-dev'
 - version: 'coq-8.13'
   repo: 'mathcomp/mathcomp-dev'
-- version: 'coq-8.12'
-  repo: 'mathcomp/mathcomp-dev'
-- version: 'coq-8.11'
-  repo: 'mathcomp/mathcomp-dev'
+- version: '1.15.0-coq-8.16'
+  repo: 'mathcomp/mathcomp'
+- version: '1.15.0-coq-8.15'
+  repo: 'mathcomp/mathcomp'
+- version: '1.15.0-coq-8.14'
+  repo: 'mathcomp/mathcomp'
 - version: '1.14.0-coq-8.15'
   repo: 'mathcomp/mathcomp'
 - version: '1.14.0-coq-8.14'