Fix tests on GHC 9.4.4

Author: hasufell

.github/workflows/test.yaml

@@ -19,12 +19,16 @@ jobs:
         include:
           - os: macOS-latest
             ghc: '9.2.6'
+            cabal: '3.8.1.0'
           - os: macOS-latest
             ghc: '9.4.4'
+            cabal: '3.8.1.0'
           - os: windows-latest
             ghc: '9.2.6'
+            cabal: '3.8.1.0'
           - os: windows-latest
             ghc: '9.4.4'
+            cabal: '3.8.1.0'
     steps:
     - uses: actions/checkout@v3
 
@@ -68,7 +72,6 @@ jobs:
         git diff --exit-code
 
   i386:
-    needs: build
     runs-on: ubuntu-latest
     container:
       image: i386/ubuntu:bionic
@@ -81,15 +84,14 @@ jobs:
     - uses: actions/checkout@v1
     - name: Test
       run: |
-        source ~/.ghcup/env
+        . ~/.ghcup/env
         cabal update
         cabal test
 
   # We use github.com/haskell self-hosted runners for ARM testing.
   # If they become unavailable in future, put ['armv7', 'aarch64']
   # back to emulation jobs above.
   arm:
-    needs: build
     runs-on: [self-hosted, Linux, ARM64]
     strategy:
       fail-fast: true
@@ -108,13 +110,13 @@ jobs:
         uses: docker://hasufell/arm32v7-ubuntu-haskell:focal
         name: Run build (arm32v7 linux)
         with:
-          args: sh -c "ghcup install ghc 9.2.2 && cabal -w ghc-9.2.2 update && cabal -w ghc-9.2.2 test"
+          args: sh -c "cabal update && ghcup install ghc --isolate=/usr --force 9.2.2 && cabal test -w ghc-9.2.2"
 
       - if: matrix.arch == 'arm64v8'
         uses: docker://hasufell/arm64v8-ubuntu-haskell:focal
         name: Run build (arm64v8 linux)
         with:
-          args: sh -c "ghcup install ghc 9.2.2 && cabal -w ghc-9.2.2 update && cabal -w ghc-9.2.2 test"
+          args: sh -c "cabal update && ghcup install ghc --isolate=/usr --force 9.2.2 && cabal test -w ghc-9.2.2"
 
   darwin_arm:
     runs-on: ${{ matrix.os }}

tests/abstract-filepath/EncodingSpec.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE TypeApplications #-}
@@ -38,7 +39,11 @@ tests =
       let str = [toEnum 55296, toEnum 55297]
           encoded = encodeWithTE utf16le str
           decoded = decodeWithTE utf16le =<< encoded
+#if __GLASGOW_HASKELL__ >= 904
+      in decoded === Left (EncodingError ("recoverEncode: invalid argument (cannot encode character " <> show (head str) <> ")") Nothing))
+#else
       in decoded === Left (EncodingError "recoverEncode: invalid argument (invalid character)" Nothing))
+#endif
   , ("ucs2 handles invalid surrogate pairs",
      property $
       let str = [toEnum 55296, toEnum 55297]
@@ -64,7 +69,11 @@ tests =
       let str = [toEnum 0xDFF0, toEnum 0xDFF2]
           encoded = encodeWithTE (mkUTF8 RoundtripFailure) str
           decoded = decodeWithTE (mkUTF8 RoundtripFailure) =<< encoded
+#if __GLASGOW_HASKELL__ >= 904
+      in decoded === Left (EncodingError ("recoverEncode: invalid argument (cannot encode character " <> show (head str) <> ")") Nothing))
+#else
       in decoded === Left (EncodingError "recoverEncode: invalid argument (invalid character)" Nothing))
+#endif
 
   , ("cannot roundtrip arbitrary bytes through utf-16 (with RoundtripFailure)",
      property $