Be explicit about the test GHC

Author: hasufell

.github/scripts/test.sh

@@ -21,13 +21,15 @@ esac
 cd ..
 
 ghcup --no-verbose install ghc --set --install-targets "${GHC_TARGETS}" "${GHC_VERSION}"
+ghcup --no-verbose install ghc --install-targets "${GHC_TARGETS}" "${GHC_TEST_VERSION}"
 
 cabal update
 
 # TODO: we want to avoid building here... we should just
 # be using the previously built 'cabal-tests' binary
-cabal run ${ADD_CABAL_ARGS} cabal-testsuite:cabal-tests -- \
+cabal run -w "${GHC_VERSION}" ${ADD_CABAL_ARGS} cabal-testsuite:cabal-tests -- \
   --with-cabal "$(pwd)/out/cabal" \
+  --with-ghc "ghc-${GHC_TEST_VERSION}" \
   --intree-cabal-lib "$(pwd)" \
   --test-tmp "$(pwd)/testdb" \
   --skip-setup-tests \

.github/workflows/reusable-release.yml

@@ -24,6 +24,7 @@ on:
 env:
   GHC_VERSION: ${{ inputs.ghc }}
   GHC_TARGETS: ${{ inputs.ghc_targets }}
+  GHC_TEST_VERSION: 9.6.7
   CABAL_VERSION: ${{ inputs.cabal }}
   BOOTSTRAP_HASKELL_NONINTERACTIVE: 1
   BOOTSTRAP_HASKELL_MINIMAL: 1
@@ -458,8 +459,6 @@ jobs:
     env:
       TARBALL_EXT: tar.xz
       ARCH: 64
-      GHC_VERSION: 9.6.7
-      GHC_TARGETS: "install_bin install_lib update_package_db"
       ADD_CABAL_ARGS: ""
     strategy:
       fail-fast: false
@@ -610,8 +609,6 @@ jobs:
       ADD_CABAL_ARGS: ""
       TARBALL_EXT: tar.xz
       ARCH: ARM64
-      GHC_VERSION: 9.6.7
-      GHC_TARGETS: "install_bin install_lib update_package_db"
     strategy:
       fail-fast: false
       matrix:
@@ -665,8 +662,6 @@ jobs:
       ARCH: 64
       TARBALL_EXT: tar.xz
       DISTRO: na
-      GHC_VERSION: 9.6.7
-      GHC_TARGETS: "install_bin install_lib update_package_db"
     strategy:
       fail-fast: false
       matrix:
@@ -704,8 +699,6 @@ jobs:
       DISTRO: na
       HOMEBREW_CHANGE_ARCH_TO_ARM: 1
       GHCUP_INSTALL_BASE_PREFIX: ${{ github.workspace }}
-      GHC_VERSION: 9.6.7
-      GHC_TARGETS: "install_bin install_lib update_package_db"
     strategy:
       fail-fast: false
       matrix:
@@ -742,8 +735,6 @@ jobs:
       DISTRO: na
       CABAL_DIR: "C:\\Users\\runneradmin\\AppData\\Roaming\\cabal"
       GHCUP_INSTALL_BASE_PREFIX: "/c"
-      GHC_VERSION: 9.6.7
-      GHC_TARGETS: "install_bin install_lib update_package_db"
     strategy:
       fail-fast: false
       matrix:
@@ -793,8 +784,6 @@ jobs:
       RUNNER_OS: FreeBSD
       CABAL_DIR: ${{ github.workspace }}/.cabal
       GHCUP_INSTALL_BASE_PREFIX: ${{ github.workspace }}
-      GHC_VERSION: 9.6.7
-      GHC_TARGETS: "install_bin install_lib update_package_db"
     strategy:
       fail-fast: false
       matrix: