Skip to content

Commit 362fdd1

Browse files
committed
Run cabal update inside project dir
1 parent 0c131c1 commit 362fdd1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/scripts/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ download_cabal_cache "$HOME/.local/bin/cabal-cache"
2121
# build
2222
ghcup install ghc "${GHC_VERSION}"
2323
ghcup set ghc "${GHC_VERSION}"
24-
(cd .. && ecabal update) # run cabal update outside project dir
24+
sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project # see comment in cabal.project
25+
ecabal update
2526
ecabal user-config diff
2627
ecabal user-config init -f
2728
"ghc-${GHC_VERSION}" --info
@@ -56,7 +57,6 @@ case "$(uname)" in
5657
cp "$(cabal list-bin -v0 ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/${ARTIFACT}/haskell-language-server-wrapper${ext}"
5758
;;
5859
*)
59-
sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project # see comment in cabal.project
6060
emake --version
6161
emake GHCUP=ghcup CABAL_CACHE_BIN=cabal-cache.sh S3_HOST="${S3_HOST}" S3_KEY="${ARTIFACT}" GHC_VERSION="${GHC_VERSION}" hls-ghc
6262
;;

0 commit comments

Comments
 (0)