Merge pull request #566 from LPCIC/fix-co

nix

Author: gares

.github/workflows/main.yml

@@ -10,6 +10,20 @@ on:
     tags: [ "v*.*.*" ]
   pull_request:
     branches: [ master ]
+  workflow_dispatch:
+    inputs:
+      suite:
+        description: "Coq OPAM suite"
+        required: true
+        default: "released"
+        type: choice
+        options:
+        - released
+        - extra-dev
+
+env:
+  OPAM_SUITE: ${{ inputs.suite }}
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -49,7 +63,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
-    needs: [build]
+    #needs: [build]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -98,6 +112,5 @@ jobs:
           eval $(opam env)
           git config --global user.name coqelpibot
           git config --global user.email [email protected]
-          OPAM_SUITE=released
           TAG=`git tag --sort=-v:refname|head -1`
-          opam-publish --tag=$TAG --packages-directory=$OPAM_SUITE/packages --repo=coq/opam --no-browser -v ${TAG##v}	https://github.com/LPCIC/coq-elpi/releases/download/$TAG/coq-elpi-${TAG##v}.tar.gz
+          opam-publish --tag=$TAG --packages-directory=${OPAM_SUITE:-released}/packages --repo=coq/opam --no-browser -v ${TAG##v}	https://github.com/LPCIC/coq-elpi/releases/download/$TAG/coq-elpi-${TAG##v}.tar.gz

.nix/config.nix

@@ -7,7 +7,7 @@
     "coq-8.19".coqPackages = {
       coq.override.version = "8.19+rc1";
 
-      hierarchy-builder.override.version = "coq-elpi-2";
+      hierarchy-builder.override.version = "master";
       hierarchy-builder-shim.job = false;
 
       mathcomp.override.version = "master";
@@ -19,7 +19,7 @@
       mathcomp-analysis.override.version = "hierarchy-builder";
       mathcomp-analysis.job = true;
 
-      mathcomp-finmap.override.version = "2.0.0";
+      mathcomp-finmap.override.version = "master";
       mathcomp-finmap.job = true;
 
       mathcomp-classical.override.version = "hierarchy-builder";