Skip to content

Commit

Permalink
Correct usage of tee for cabal.project
Browse files Browse the repository at this point in the history
  • Loading branch information
Jared Weakly committed Aug 19, 2020
1 parent cf66502 commit 4035491
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ install_yices() {
install_yasm() {
is_exe "$BIN" "yasm" && return
if [[ "$RUNNER_OS" = "Linux" ]]; then
sudo apt-get install -y yasm
sudo apt-get update -q && sudo apt-get install -y yasm
else
brew install yasm
fi
Expand All @@ -115,7 +115,7 @@ build() {
# Limit jobs on windows due to: https://gitlab.haskell.org/ghc/ghc/issues/17926
if [[ "$ghc_ver" =~ 8.8.3|8.10.1 && $IS_WIN ]]; then JOBS=1; else JOBS=2; fi
cabal v2-configure -j$JOBS --minimize-conflict-set
tee -a cabal.project cabal.project.ci > /dev/null
tee -a cabal.project > /dev/null < cabal.project.ci
retry cabal v2-build "$@" saw jss
}

Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ script:
# Ideally, we'd like to pass --ghc-options=-Werror to cabal build.
# However, this currently enables -Werror for all dependencies as well.
# See: https://github.com/haskell/cabal/issues/3883
- tee -a cabal.project cabal.project.ci
- tee -a cabal.project > /dev/null < cabal.project.ci
- cabal new-build -j saw jss
- cp `cabal new-exec --verbose=silent -- sh -c 'which saw'` bin
- cp `cabal new-exec --verbose=silent -- sh -c 'which jss'` bin
Expand Down

0 comments on commit 4035491

Please sign in to comment.