Skip to content

Commit 79a6865

Browse files
committed
Fix CI
1 parent 2318c61 commit 79a6865

File tree

5 files changed

+1239
-4240
lines changed

5 files changed

+1239
-4240
lines changed

.github/scripts/common.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@ install_ghcup() {
137137
else
138138
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_MINIMAL=1 sh
139139
source "$(dirname "${GHCUP_BIN}")/env"
140-
# make sure we use the vanilla channel for installing binaries
141-
# see https://github.com/haskell/ghcup-metadata/pull/166#issuecomment-1893075575
142-
ghcup config set url-source https://raw.githubusercontent.com/haskell/ghcup-metadata/refs/heads/master/ghcup-vanilla-0.0.9.yaml
143140
ghcup install cabal --set "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
144141
fi
145142
}

.github/scripts/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ test_all_hls() {
5959
fi
6060
fi
6161
done
62-
# install the recommended GHC version so the wrapper can launch HLS
63-
ghcup install ghc --set 9.10.1
62+
ghcup install ghc --set recommended
6463
"$bindir/haskell-language-server-wrapper${ext}" typecheck "${test_module}" || fail "failed to typecheck with HLS wrapper"
64+
ghcup rm ghc "$(ghc --numeric-version)"
6565
}
6666

6767
uname -a

0 commit comments

Comments
 (0)