CI: Test GHC 9.4.4 and 9.2.7, drop 9.0.2

GaloisInc · Apr 3, 2023 · fc48952 · fc48952
1 parent e10dfea
commit fc48952
Show file tree

Hide file tree

Showing 11 changed files with 106 additions and 671 deletions.
diff --git a/.github/workflows/crucible-go-build.yml b/.github/workflows/crucible-go-build.yml
@@ -27,12 +27,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        ghc: ["8.10.7", "9.0.2", "9.2.4"]
+        cabal: ["3.8.1.0"]
+        ghc: ["8.10.7", "9.2.7", "9.4.4"]
         include:
           - os: macos-12
-            ghc: 9.2.4
+            cabal: 3.8.1.0
+            ghc: 9.4.4
           - os: windows-2019
-            ghc: 9.2.4
+            cabal: 3.8.1.0
+            ghc: 9.4.4
     name: crucible-go - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -43,6 +46,7 @@ jobs:
         id: setup-haskell
         with:
           ghc-version: ${{ matrix.ghc }}
+          cabal-version: ${{ matrix.cabal }}
 
       - name: Post-GHC installation fixups on Windows
         shell: bash
@@ -82,8 +86,8 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-22.05 ;;
-            9.2.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
             *)     GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
           esac
           echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV

diff --git a/.github/workflows/crucible-jvm-build.yml b/.github/workflows/crucible-jvm-build.yml
@@ -27,12 +27,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        ghc: ["8.10.7", "9.0.2", "9.2.4"]
+        cabal: ["3.8.1.0"]
+        ghc: ["8.10.7", "9.2.7", "9.4.4"]
         include:
           - os: macos-12
-            ghc: 9.2.4
+            cabal: 3.8.1.0
+            ghc: 9.4.4
           - os: windows-2019
-            ghc: 9.2.4
+            cabal: 3.8.1.0
+            ghc: 9.4.4
     name: crucible-jvm - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -43,6 +46,7 @@ jobs:
         id: setup-haskell
         with:
           ghc-version: ${{ matrix.ghc }}
+          cabal-version: ${{ matrix.cabal }}
 
       - name: Post-GHC installation fixups on Windows
         shell: bash
@@ -82,8 +86,8 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-22.05 ;;
-            9.2.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
             *)     GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
           esac
           echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV

diff --git a/.github/workflows/crucible-wasm-build.yml b/.github/workflows/crucible-wasm-build.yml
@@ -27,12 +27,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        ghc: ["8.10.7", "9.0.2", "9.2.4"]
+        cabal: ["3.8.1.0"]
+        ghc: ["8.10.7", "9.2.7", "9.4.4"]
         include:
           - os: macos-12
-            ghc: 9.2.4
+            cabal: 3.8.1.0
+            ghc: 9.4.4
           - os: windows-2019
-            ghc: 9.2.4
+            cabal: 3.8.1.0
+            ghc: 9.4.4
     name: crucible-wasm - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -43,6 +46,7 @@ jobs:
         id: setup-haskell
         with:
           ghc-version: ${{ matrix.ghc }}
+          cabal-version: ${{ matrix.cabal }}
 
       - name: Post-GHC installation fixups on Windows
         shell: bash
@@ -82,8 +86,8 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-22.05 ;;
-            9.2.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
             *)     GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
           esac
           echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV

diff --git a/.github/workflows/crux-llvm-build.yml b/.github/workflows/crux-llvm-build.yml
@@ -44,16 +44,21 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        ghc: ["8.10.7", "9.0.2", "9.2.4"]
+        cabal: ["3.8.1.0"]
+        ghc: ["8.10.7", "9.2.7", "9.4.4"]
         include:
           - os: ubuntu-22.04
+            cabal: 3.8.1.0
             ghc: 8.8.4
           - os: ubuntu-20.04
-            ghc: 9.2.4
+            cabal: 3.8.1.0
+            ghc: 9.4.4
           - os: macos-12
-            ghc: 9.2.4
+            cabal: 3.8.1.0
+            ghc: 9.2.7
           - os: windows-2019
-            ghc: 9.2.4
+            cabal: 3.8.1.0
+            ghc: 9.2.7
     name: crux-llvm - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -64,6 +69,7 @@ jobs:
         id: setup-haskell
         with:
           ghc-version: ${{ matrix.ghc }}
+          cabal-version: ${{ matrix.cabal }}
 
       - name: Post-GHC installation fixups on Windows
         shell: bash
@@ -103,9 +109,8 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-22.05 ;;
-            9.2.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-22.05 ;;
-            9.2.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
             *)     GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
           esac
           echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV

diff --git a/.github/workflows/crux-mir-build.yml b/.github/workflows/crux-mir-build.yml
@@ -43,12 +43,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        ghc: ["8.10.7", "9.0.2", "9.2.4"]
+        cabal: ["3.8.1.0"]
+        ghc: ["8.10.7", "9.2.7", "9.4.4"]
         # include:
           # Disable the macOS build for now due to
           # https://github.com/GaloisInc/crucible/issues/1050
           #
           # - os: macos-12
+          #   cabal: 3.8.1.0
           #   ghc: 9.2.4
 
           # We want Windows soon, but it doesn't need to be now
@@ -62,6 +64,7 @@ jobs:
         id: setup-haskell
         with:
           ghc-version: ${{ matrix.ghc }}
+          cabal-version: ${{ matrix.cabal }}
 
       - name: Post-GHC installation fixups on Windows
         shell: bash
@@ -108,8 +111,8 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-22.05 ;;
-            9.2.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
             *)     GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
           esac
           echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV