Merge pull request #1559 from GaloisInc/ghc-9.0

Support building with GHC 9.0

.github/workflows/ci.yml

@@ -1,5 +1,5 @@
 # Overall configuration notes:
-# - Artifact uploads for binaries are from GHC 8.10.3
+# - Artifact uploads for binaries are from GHC 8.10.7
 # - Builds for Ubuntu happen on 18.04 (would like to include 20.04, in addition)
 # - Builds for macOS builds on 10.15 (to avoid GHC bug on macOS 11; solvable with GHC > 8.10.4)
 # - Docker builds happen nightly, on manual invocation, and on release branch commits
@@ -68,10 +68,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-18.04, macos-10.15, windows-latest]
-        ghc: ["8.8.4", "8.10.3"]
+        ghc: ["8.8.4", "8.10.7", "9.0.2"]
         exclude:
           - os: windows-latest
             ghc: "8.8.4"
+          # Exclude 9.0 on Windows for now until
+          # https://github.com/commercialhaskell/stackage/issues/6400
+          # is resolved
+          - os: windows-latest
+            ghc: "9.0.2"
     outputs:
       cabal-test-suites-json: ${{ steps.cabal-test-suites.outputs.targets-json }}
     steps:
@@ -133,7 +138,7 @@ jobs:
           dest: dist-tests
 
       - uses: actions/upload-artifact@v2
-        if: "matrix.ghc == '8.10.3'"
+        if: "matrix.ghc == '8.10.7'"
         with:
           path: dist-tests
           name: dist-tests-${{ matrix.os }}
@@ -150,37 +155,37 @@ jobs:
       - shell: bash
         run: .github/ci.sh zip_dist_with_solvers $NAME-with-solvers
 
-      - if: matrix.ghc == '8.10.3' && needs.config.outputs.release == 'true'
+      - if: matrix.ghc == '8.10.7' && needs.config.outputs.release == 'true'
         shell: bash
         env:
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
         run: .github/ci.sh sign $NAME.tar.gz
 
-      - if: matrix.ghc == '8.10.3' && needs.config.outputs.release == 'true'
+      - if: matrix.ghc == '8.10.7' && needs.config.outputs.release == 'true'
         shell: bash
         env:
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
         run: .github/ci.sh sign $NAME-with-solvers.tar.gz
 
-      - if: matrix.ghc == '8.10.3'
+      - if: matrix.ghc == '8.10.7'
         uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.config.outputs.name }} (GHC ${{ matrix.ghc }})
           path: "${{ steps.config.outputs.name }}.tar.gz*"
           if-no-files-found: error
           retention-days: ${{ needs.config.outputs.retention-days }}
 
-      - if: matrix.ghc == '8.10.3'
+      - if: matrix.ghc == '8.10.7'
         uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.config.outputs.name }} (GHC ${{ matrix.ghc }})
           path: "${{ steps.config.outputs.name }}-with-solvers.tar.gz*"
           if-no-files-found: error
           retention-days: ${{ needs.config.outputs.retention-days }}
 
-      - if: "matrix.ghc == '8.10.3'"
+      - if: "matrix.ghc == '8.10.7'"
         uses: actions/upload-artifact@v2
         with:
           path: dist/bin
@@ -474,7 +479,7 @@ jobs:
           - hmac-failure
           - awslc
           - blst
-        ghc: ["8.10.3"]
+        ghc: ["8.10.7"]
     steps:
       - uses: actions/checkout@v2
       - run: |

README.md

@@ -42,7 +42,7 @@ To build SAWScript and related utilities from source:
   * Ensure that you have the `cabal` and `ghc` executables in your
     `PATH`. If you don't already have them, we recommend using `ghcup`
     to install them: <https://www.haskell.org/ghcup/>. We recommend
-    Cabal 3.4 or newer, and GHC 8.8 or 8.10.
+    Cabal 3.4 or newer, and GHC 8.8, 8.10, or 9.0.
 
   * Ensure that you have the C libraries and header files for
     `terminfo`, which generally comes as part of `ncurses` on most