Merge pull request #383 from proux01/coq_master_ci

[CI] Add Coq master and Coq 8.18 to master branch
math-comp · Sep 6, 2023 · a23b4fc · a23b4fc
2 parents e2545b6 + d0788e8
commit a23b4fc
Show file tree

Hide file tree

Showing 7 changed files with 3,294 additions and 157 deletions.
diff --git a/.github/workflows/nix-action-coq-8.15.yml b/.github/workflows/nix-action-coq-8.15.yml
diff --git a/.github/workflows/nix-action-coq-8.16.yml b/.github/workflows/nix-action-coq-8.16.yml
diff --git a/.github/workflows/nix-action-coq-8.17.yml b/.github/workflows/nix-action-coq-8.17.yml
diff --git a/.github/workflows/nix-action-coq-8.18.yml b/.github/workflows/nix-action-coq-8.18.yml
diff --git a/.github/workflows/nix-action-coq-master.yml b/.github/workflows/nix-action-coq-master.yml
diff --git a/.nix/config.nix b/.nix/config.nix
@@ -4,7 +4,7 @@
   default-bundle = "coq-8.16";
   bundles = let
     mcHBcommon = {
-      mathcomp.override.version = "hierarchy-builder";
+      mathcomp.override.version = "master";
       mathcomp.job = true;
       mathcomp-single.job = true;
       hierarchy-builder-shim.job = true;
@@ -20,17 +20,30 @@
       deriving.job = false;
     };
   in {
-    "coq-8.17".coqPackages = {
+    "coq-master".coqPackages = mcHBcommon // {
+      coq.override.version = "master";
+      coq-elpi.override.version = "coq-master";
+      interval.job = false;
+    };
+
+    "coq-8.18".coqPackages = mcHBcommon // {
+      coq.override.version = "8.18";
+      interval.job = false;
+    };
+
+    "coq-8.17".coqPackages = mcHBcommon // {
       coq.override.version = "8.17";
-    } // mcHBcommon;
+    };
 
-    "coq-8.16".coqPackages = {
+    "coq-8.16".coqPackages = mcHBcommon // {
       coq.override.version = "8.16";
-    } // mcHBcommon;
+    };
 
-    "coq-8.15".coqPackages = {
+    "coq-8.15".coqPackages = mcHBcommon // {
       coq.override.version = "8.15";
       mathcomp.job = false;
+      mathcomp-classical.job = false;
+      mathcomp-analysis.job = false;
       mathcomp-infotheo.job = false;
     };
   };

diff --git a/.nix/coq-nix-toolbox.nix b/.nix/coq-nix-toolbox.nix
@@ -1 +1 @@
-"721d4a5e7a4db115f7576828c354d62a84d7055b"
+"e2e960c53ffb1042705dc5913379c1fb360189c0"