Merge docker workflow into ci.yml

JasonGross · Oct 19, 2023 · 06836c7 · 06836c7
1 parent 2d4d6b9
commit 06836c7
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 58 deletions.
diff --git a/.github/workflows/ci-dev.yml b/.github/workflows/ci-dev.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
         python -m pip install --upgrade pip
     - name: Lint with flake8
       run: |
-        pip install flake8
+        python -m pip install flake8
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
@@ -60,13 +60,48 @@ jobs:
     - name: Test
       run: make print-support && make has-all-tests && make check PYTHON=python CAT_ALL_LOGS=1
 
+  docker-build:
+    strategy:
+      fail-fast: false
+      matrix:
+        coq-version: ['dev', '8.18', '8.17', '8.16', '8.15', '8.14', '8.13', '8.12', '8.11', '8.10', '8.9', '8.8', '8.7', '8.6', '8.5', '8.4']
+        ocaml-version: ['default']
+
+    runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.workflow }}-${{ matrix.coq-version }}-${{ matrix.ocaml-version }}-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: coq-community/docker-coq-action@v1
+      with:
+        coq_version: ${{ matrix.coq-version }}
+        ocaml_version: ${{ matrix.ocaml-version }}
+        custom_script: |
+          sudo chmod -R a=u .
+          # Work around https://github.com/actions/checkout/issues/766
+          git config --global --add safe.directory "*"
+          startGroup 'install general dependencies'
+          sudo apt-get update -y
+          sudo apt-get install -y python3
+          eval $(opam env)
+          endGroup
+          startGroup 'make print-support'
+          make print-support PYTHON=python3
+          endGroup
+          make check PYTHON=python3 CAT_ALL_LOGS=1
 
   check-all:
     runs-on: ubuntu-latest
-    needs: build
+    needs: [docker-build, build]
     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' }}
+    - run: echo 'The triggering workflow passed (docker)'
+      if: ${{ needs.docker-build.result == 'success' }}
+    - run: echo 'The triggering workflow failed (docker)' && false
+      if: ${{ needs.docker-build.result != 'success' }}