Tweak CI

Author: andrew-appel

.github/workflows/coq-action.yml

@@ -30,7 +30,7 @@ jobs:
         make_target:
           - vst
         exclude:
-          - coq_version: 9.0
+          - coq_version: 9.1
             bit_size: 32
           - coq_version: dev
             bit_size: 32
@@ -50,7 +50,8 @@ jobs:
             endGroup
           install: |
             startGroup "Install dependencies"
-              opam install -y ${{ matrix.coq_version == 'dev' && 'coq-flocq' || matrix.bit_size == 32 && 'coq-compcert-32.3.13.1' || 'coq-compcert.3.13.1' }}
+	      opam install -y coq-stdlib
+              opam install -y ${{ matrix.coq_version == 'dev' && 'coq-flocq' || matrix.bit_size == 32 && 'coq-compcert-32.3.16' || 'coq-compcert.3.16' }}
               # Required by test2
               opam install -y coq-ext-lib
               opam install -y coq-paco
@@ -62,7 +63,7 @@ jobs:
             endGroup
           script: |
             startGroup "Build & Install"
-              # put the first version back once CompCert 3.15 is in the Coq Platform
+              # put the first version back once CompCert 3.16 is in the Coq Platform
               # make ${{matrix.make_target}} BITSIZE=${{matrix.bit_size}} COMPCERT=${{ matrix.coq_version=='dev' && 'bundled' || 'platform' }} IGNORECOQVERSION=true IGNORECOMPCERTVERSION=true
               make ${{matrix.make_target}} BITSIZE=${{matrix.bit_size}} COMPCERT=bundled IGNORECOQVERSION=true IGNORECOMPCERTVERSION=true
             endGroup
@@ -89,6 +90,8 @@ jobs:
       fail-fast: false
       matrix:
         coq_version:
+          - '9.0'
+          - '9.1'
           - 'dev' 
         make_target:
           - assumptions.txt
@@ -101,6 +104,10 @@ jobs:
           - 32
           - 64
         exclude:
+          - coq_version: 9.1
+            bit_size: 32
+          - coq_version: dev
+            bit_size: 32
           - bit_size: 64
             make_target: test3
           - bit_size: 32
@@ -132,7 +139,7 @@ jobs:
           script: |
             startGroup "Build & Install"
               make -f util/make-touch  IGNORECOQVERSION=true IGNORECOMPCERTVERSION=true
-              # put the first version back once CompCert 3.15 is in the Coq Platform
+              # put the first version back once CompCert 3.16 is in the Coq Platform
               # make ${{matrix.make_target}} BITSIZE=${{matrix.bit_size}} COMPCERT=${{ matrix.coq_version=='dev' && 'bundled' || 'platform' }}  IGNORECOQVERSION=true IGNORECOMPCERTVERSION=true
               make ${{matrix.make_target}} BITSIZE=${{matrix.bit_size}} COMPCERT=bundled IGNORECOQVERSION=true IGNORECOMPCERTVERSION=true
             endGroup