Skip to content

Commit

Permalink
Merge pull request #566 from LPCIC/fix-co
Browse files Browse the repository at this point in the history
nix
  • Loading branch information
gares authored Dec 29, 2023
2 parents 3313ced + 07f9b2b commit 6d94efa
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
19 changes: 16 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions .nix/config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand Down

0 comments on commit 6d94efa

Please sign in to comment.