Support building with GHC 9.8

.github/workflows/ci.yml

@@ -65,28 +65,28 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        ghc-version: ["9.2.8", "9.4.7", "9.6.2"]
-        cabal: [ '3.10.1.0' ]
+        ghc-version: ["9.4.8", "9.6.5", "9.8.2"]
+        cabal: [ '3.10.3.0' ]
         run-tests: [true]
         include:
           # We include one job from an older Ubuntu LTS release to increase our
           # coverage of possible Linux configurations. Since we already run the
           # tests with the newest LTS release, we won't bother testing this one.
           - os: ubuntu-20.04
-            ghc-version: 9.2.8
+            ghc-version: 9.4.8
             run-tests: false
           # Windows and macOS CI runners are more expensive than Linux runners,
           # so we only build one particular GHC version to test them on. We
           # include both an x86-64 macOS runner (macos-12) as well as an AArch64
           # macOS runner (macos-14).
           - os: windows-2019
-            ghc-version: 9.2.8
+            ghc-version: 9.4.8
             run-tests: true
           - os: macos-12
-            ghc-version: 9.2.8
+            ghc-version: 9.4.8
             run-tests: true
           - os: macos-14
-            ghc-version: 9.2.8
+            ghc-version: 9.4.8
             run-tests: true
     outputs:
       test-lib-json: ${{ steps.test-lib.outputs.targets-json }}
@@ -227,13 +227,13 @@ jobs:
           if-no-files-found: error
           retention-days: ${{ needs.config.outputs.retention-days }}
 
-      - if: matrix.ghc-version == '9.2.8' && matrix.run-tests
+      - if: matrix.ghc-version == '9.4.8' && matrix.run-tests
         uses: actions/upload-artifact@v2
         with:
           path: dist/bin
           name: ${{ matrix.os }}-dist-bin
 
-      - if: matrix.ghc-version == '9.2.8' && matrix.run-tests
+      - if: matrix.ghc-version == '9.4.8' && matrix.run-tests
         uses: actions/upload-artifact@v2
         with:
           path: bin
@@ -287,7 +287,7 @@ jobs:
 
       - uses: haskell/actions/setup@v2
         with:
-          ghc-version: '9.2.8'
+          ghc-version: '9.4.8'
 
       # Homebrew installs packages in different directories depending on which
       # macOS architecture you are using:
@@ -311,13 +311,16 @@ jobs:
         uses: msys2/setup-msys2@v2
         with:
           update: true
-          msystem: MINGW64
+          # NB: Use CLANG64 here, not MINGW64. GHC 9.4 and later bundle a
+          # Clang-based C toolchain on Windows, and the FFI-related tests work
+          # best when the DLLs are compiled with Clang as well.
+          msystem: CLANG64
           # These are needed for the ffi tests on Windows
           install: |
             diffutils
             make
-            mingw-w64-x86_64-gcc
-            mingw-w64-x86_64-gmp
+            mingw-w64-clang-x86_64-gcc
+            mingw-w64-clang-x86_64-gmp
         if: matrix.suite == 'test-lib' && runner.os == 'Windows'
 
       - if: matrix.suite == 'rpc'

.gitpod.Dockerfile

@@ -19,10 +19,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
 RUN curl https://i.jpillora.com/chisel! | bash
 
 # Install GHC
-ARG GHCVER="9.2.8"
+ARG GHCVER="9.4.8"
 ENV GHCUP_INSTALL_BASE_PREFIX=/opt \
     PATH=/opt/.ghcup/bin:$PATH
-RUN curl -o /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/0.1.19.4/x86_64-linux-ghcup-0.1.19.4" && \
+RUN curl -o /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/0.1.22.0/x86_64-linux-ghcup-0.1.22.0" && \
     chmod +x /usr/local/bin/ghcup
 RUN ghcup install cabal --set
 ENV PATH=/root/.cabal/bin:$PATH

Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:22.04 AS build
 
-ARG GHCVER="9.2.8"
-ARG CABALVER="3.10.1.0"
+ARG GHCVER="9.4.8"
+ARG CABALVER="3.10.3.0"
 RUN apt-get update && \
     apt-get install -y \
       # ghcup requirements
@@ -28,7 +28,7 @@ ENV LANG=C.UTF-8 \
     LC_ALL=C.UTF-8
 COPY cabal.GHC-${GHCVER}.config cabal.project.freeze
 RUN mkdir -p /home/cryptol/.local/bin && \
-    curl -L https://downloads.haskell.org/~ghcup/0.1.19.4/x86_64-linux-ghcup-0.1.19.4 -o /home/cryptol/.local/bin/ghcup && \
+    curl -L https://downloads.haskell.org/~ghcup/0.1.22.0/x86_64-linux-ghcup-0.1.22.0 -o /home/cryptol/.local/bin/ghcup && \
     chmod +x /home/cryptol/.local/bin/ghcup
 RUN mkdir -p /home/cryptol/.ghcup && \
     ghcup --version && \

README.md

@@ -82,8 +82,8 @@ Windows. We regularly build and test it in the following environments:
 ## Prerequisites
 
 Cryptol is regularly built and tested with the three most recent
-versions of GHC, which at the time of this writing are 9.2.8, 9.4.7, and
-9.6.2. The easiest way to install an appropriate version of GHC is
+versions of GHC, which at the time of this writing are 9.4.8, 9.6.2, and
+9.8.2. The easiest way to install an appropriate version of GHC is
 with [ghcup](https://www.haskell.org/ghcup/).
 
 Some supporting non-Haskell libraries are required to build