Skip to content

Commit

Permalink
Run cabal update inside project dir
Browse files Browse the repository at this point in the history
  • Loading branch information
wz1000 committed Oct 10, 2023
1 parent 0c131c1 commit 362fdd1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ download_cabal_cache "$HOME/.local/bin/cabal-cache"
# build
ghcup install ghc "${GHC_VERSION}"
ghcup set ghc "${GHC_VERSION}"
(cd .. && ecabal update) # run cabal update outside project dir
sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project # see comment in cabal.project
ecabal update
ecabal user-config diff
ecabal user-config init -f
"ghc-${GHC_VERSION}" --info
Expand Down Expand Up @@ -56,7 +57,6 @@ case "$(uname)" in
cp "$(cabal list-bin -v0 ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/${ARTIFACT}/haskell-language-server-wrapper${ext}"
;;
*)
sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project # see comment in cabal.project
emake --version
emake GHCUP=ghcup CABAL_CACHE_BIN=cabal-cache.sh S3_HOST="${S3_HOST}" S3_KEY="${ARTIFACT}" GHC_VERSION="${GHC_VERSION}" hls-ghc
;;
Expand Down

0 comments on commit 362fdd1

Please sign in to comment.