Skip to content

Commit 66a2260

Browse files
committed
CI fixes
1 parent 7165527 commit 66a2260

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.github/scripts/build.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ download_cabal_cache "$HOME/.local/bin/cabal-cache"
2222
ghcup install ghc "${GHC_VERSION}"
2323
ghcup set ghc "${GHC_VERSION}"
2424
(cd .. && ecabal update) # run cabal update outside project dir
25+
ecabal user-config diff
26+
ecabal user-config init -f
2527
"ghc-${GHC_VERSION}" --info
2628
"ghc" --info
2729

@@ -30,6 +32,10 @@ mkdir -p "$CI_PROJECT_DIR/out/plan.json"
3032

3133
case "$(uname)" in
3234
MSYS_*|MINGW*)
35+
# cat "C:\Users\runneradmin\AppData\Roaming\cabal\config"
36+
# sed -ic "/extra-include-dirs/d" "C:\Users\runneradmin\AppData\Roaming\cabal\config"
37+
# sed -ic "/extra-lib-dirs/d" "C:\Users\runneradmin\AppData\Roaming\cabal\config"
38+
cat "C:\Users\runneradmin\AppData\Roaming\cabal\config"
3339
args=( -O2 -w "ghc-$GHC_VERSION" --project-file cabal.project --disable-profiling --disable-tests --enable-executable-stripping ${ADD_CABAL_ARGS})
3440

3541
# Shorten binary names

.github/scripts/test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ test_all_hls() {
3838
bin_noexe=${bin/.exe/}
3939
if ! [[ "${bin_noexe}" =~ "haskell-language-server-wrapper" ]] && ! [[ "${bin_noexe}" =~ "~" ]] ; then
4040
if ghcup install ghc --set "${bin_noexe/haskell-language-server-/}" ; then
41-
ecabal update
4241
"${hls}" typecheck "${test_module}" || fail "failed to typecheck with HLS for GHC ${bin_noexe/haskell-language-server-/}"
4342
else
4443
fail "GHCup failed to install GHC ${bin_noexe/haskell-language-server-/}"
@@ -55,6 +54,9 @@ env
5554

5655
# ensure ghcup
5756
install_ghcup
57+
ghcup install ghc --set 9.4.4
58+
59+
ecabal update
5860

5961
# unpack
6062
TARBALL_PREFIX="haskell-language-server"

0 commit comments

Comments
 (0)