diff --git a/.github/workflows/coq.yml b/.github/workflows/coq.yml index f830a68c3..e8d391ec9 100644 --- a/.github/workflows/coq.yml +++ b/.github/workflows/coq.yml @@ -12,9 +12,13 @@ jobs: strategy: fail-fast: false matrix: + os: [ ubuntu-latest ] + env: + - { COQ_VERSION: "8.17.1", COQ_PACKAGE: "coq-8.17.1 libcoq-8.17.1-ocaml-dev", SKIP_VALIDATE: "" , PPA: "ppa:jgross-h/many-coq-versions-ocaml-4-11" } + # Ltac2 is broken in the 8.16 package + #- { COQ_VERSION: "8.16.1", COQ_PACKAGE: "coq-8.16.1 libcoq-8.16.1-ocaml-dev", SKIP_VALIDATE: "" , PPA: "ppa:jgross-h/many-coq-versions-ocaml-4-11" } + - { COQ_VERSION: "8.15.2", COQ_PACKAGE: "coq-8.15.2 libcoq-8.15.2-ocaml-dev", SKIP_VALIDATE: "" , PPA: "ppa:jgross-h/many-coq-versions-ocaml-4-08" } include: - - env: { COQ_VERSION: "8.15.0", COQ_PACKAGE: "coq-8.15.0 libcoq-8.15.0-ocaml-dev", SKIP_VALIDATE: "" , PPA: "ppa:jgross-h/many-coq-versions-ocaml-4-08" } - os: ubuntu-latest - env: { COQ_VERSION: "v8.15" , COQ_PACKAGE: "coq libcoq-ocaml-dev" , SKIP_VALIDATE: "" , PPA: "ppa:jgross-h/coq-8.15-daily" } os: ubuntu-20.04 diff --git a/.github/workflows/docker-coq.yml b/.github/workflows/docker-coq.yml index dda30e6e3..2c0b12f85 100644 --- a/.github/workflows/docker-coq.yml +++ b/.github/workflows/docker-coq.yml @@ -1,4 +1,4 @@ -name: CI (Coq, docker, dev) +name: CI (Coq, docker) on: push: @@ -7,7 +7,13 @@ on: - cron: '0 0 1 * *' jobs: - build-dev: + build-docker: + + strategy: + fail-fast: false + matrix: + coq-version: [ 'dev' , '8.16' ] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -16,7 +22,7 @@ jobs: - name: all uses: coq-community/docker-coq-action@v1 with: - coq_version: dev + coq_version: ${{ matrix.coq-version }} ocaml_version: default custom_script: | sudo chmod -R a=u . @@ -30,3 +36,13 @@ jobs: echo '::remove-matcher owner=coq-problem-matcher::' etc/ci/github-actions-make.sh --warnings -j2 all etc/ci/github-actions-make.sh --warnings -j2 perf-Sanity + + check-all-docker: + runs-on: ubuntu-latest + needs: build-docker + if: always() + steps: + - run: echo 'The triggering workflow passed' + if: ${{ needs.build.result == 'success' }} + - run: echo 'The triggering workflow failed' && false + if: ${{ needs.build.result != 'success' }}