Adjust CI to our needs

stable-haskell · May 15, 2024 · 9598f48 · 9598f48
1 parent dd1be1b
commit 9598f48
Show file tree

Hide file tree

Showing 5 changed files with 374 additions and 114 deletions.
diff --git a/.github/scripts/common.sh b/.github/scripts/common.sh
@@ -137,9 +137,6 @@ install_ghcup() {
 	else
 		curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_MINIMAL=1 sh
 		source "$(dirname "${GHCUP_BIN}")/env"
-		# make sure we use the vanilla channel for installing binaries
-		# see https://github.com/haskell/ghcup-metadata/pull/166#issuecomment-1893075575
-		ghcup config set url-source https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-vanilla-0.0.8.yaml
 		ghcup install cabal --set "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
 	fi
 }

diff --git a/.github/scripts/env.sh b/.github/scripts/env.sh
@@ -11,7 +11,7 @@ fi
 export PATH="$HOME/.local/bin:$PATH"
 
 export BOOTSTRAP_HASKELL_NONINTERACTIVE=1
-export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-3.10.2.0}"
+export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-3.10.2.1}"
 export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=no
 export BOOTSTRAP_HASKELL_INSTALL_NO_STACK=yes
 export BOOTSTRAP_HASKELL_ADJUST_BASHRC=1

diff --git a/.github/scripts/test.sh b/.github/scripts/test.sh
@@ -48,9 +48,9 @@ test_all_hls() {
             fi
         fi
     done
-    # install the recommended GHC version so the wrapper can launch HLS
-    ghcup install ghc --set recommended
+	ghcup install ghc --set recommended
     "$bindir/haskell-language-server-wrapper${ext}" typecheck "${test_module}" || fail "failed to typecheck with HLS wrapper"
+	ghcup rm ghc "$(ghc --numeric-version)"
 }
 
 uname -a