Skip to content

Commit 8292acd

Browse files
committed
Build and run test with the same GHC version
As otherwise it leads to test failures in: * cabal-testsuite/PackageTests/ConfigFile/T8487/cabal.test.hs * cabal-testsuite/PackageTests/HaddockProject/haddock-project.test.hs
1 parent c9cbcae commit 8292acd

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

.github/scripts/test.bash

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,15 @@ case "${TARBALL_EXT}" in
1818
esac
1919
cd ..
2020

21-
ghcup --no-verbose install ghc --set --install-targets "${GHC_TARGETS}" "${GHC_VERSION}"
2221
ghcup --no-verbose install ghc --install-targets "${GHC_TEST_TARGETS}" "${GHC_TEST_VERSION}"
2322

2423
cabal update
2524

2625
# TODO: we want to avoid building here... we should just
2726
# be using the previously built 'cabal-tests' binary
2827
# Also see https://github.com/haskell/cabal/issues/11048
29-
cabal run -w "ghc-${GHC_VERSION}" ${ADD_CABAL_ARGS} cabal-testsuite:cabal-tests -- \
28+
cabal run -w "ghc-${GHC_TEST_VERSION}" ${ADD_CABAL_ARGS} cabal-testsuite:cabal-tests -- \
3029
--with-cabal "$(pwd)/out/cabal" \
31-
--with-ghc "ghc-${GHC_TEST_VERSION}" \
3230
--intree-cabal-lib "$(pwd)" \
3331
--test-tmp "$(pwd)/testdb" \
3432
--skip-setup-tests \

.github/workflows/reusable-release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ env:
2525
GHC_VERSION: ${{ inputs.ghc }}
2626
GHC_TARGETS: ${{ inputs.ghc_targets }}
2727
# This shouldn't be necessary, but cabal developers
28-
# whant to build with 9.10.2, which causes test failures
29-
# when used as runtime GHC version as well. So we need a different
30-
# runtime GHC version than the build GHC.
28+
# want to build with 9.10.2, which causes test failures
29+
# when used as runtime GHC version as well.
3130
GHC_TEST_VERSION: 9.6.7
3231
GHC_TEST_TARGETS: "install_bin install_lib update_package_db"
3332
CABAL_VERSION: ${{ inputs.cabal }}

0 commit comments

Comments
 (0)