-
Notifications
You must be signed in to change notification settings - Fork 84
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
149 additions
and
207 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,36 @@ | ||
| --- .github/workflows/haskell-ci.yml 2023-10-01 14:22:56.830944330 -0400 | ||
| +++ .github/workflows/haskell-ci.yml-patched 2023-10-01 14:22:50.497720853 -0400 | ||
| @@ -144,6 +144,7 @@ | ||
| @@ -111,6 +111,7 @@ jobs: | ||
| echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" | ||
| HCDIR=/opt/$HCKIND/$HCVER | ||
| if [ "${{ matrix.setup-method }}" = ghcup ]; then | ||
| HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") | ||
| + echo "$HOME/.ghcup/bin" >> "$GITHUB_PATH" | ||
| HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') | ||
| HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') | ||
| echo "HC=$HC" >> "$GITHUB_ENV" | ||
| @@ -152,6 +153,7 @@ | ||
| echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" | ||
| else | ||
| HC=$HCDIR/bin/$HCKIND | ||
| + echo "$HCDIR/bin" >> "$GITHUB_PATH" | ||
| echo "HC=$HC" >> "$GITHUB_ENV" | ||
| echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV" | ||
| echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV" | ||
| @@ -298,7 +300,7 @@ | ||
| cat cabal.project.local | ||
| - name: dump install plan | ||
| run: | | ||
| - $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all | ||
| + $CABAL v2-build --flags=-bootstrap $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all | ||
| cabal-plan | ||
| - name: restore cache | ||
| uses: actions/cache/restore@v3 | ||
| @@ -308,17 +310,20 @@ | ||
| HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") | ||
| + echo "$HOME/.ghcup/bin" >> "$GITHUB_PATH" | ||
| HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') | ||
| HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') | ||
| echo "HC=$HC" >> "$GITHUB_ENV" | ||
| @@ -252,17 +253,20 @@ jobs: | ||
| restore-keys: ${{ runner.os }}-${{ matrix.compiler }}- | ||
| - name: install dependencies | ||
| run: | | ||
| - $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all | ||
| - $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all | ||
| - - name: build w/o tests | ||
| + $CABAL v2-build --flags=-bootstrap $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all | ||
| + $CABAL v2-build --flags=-bootstrap $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all | ||
| + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all | ||
| + $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all | ||
| + - name: build w/o tests and install | ||
| run: | | ||
| - $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all | ||
| + $CABAL v2-install --reinstall --overwrite-policy=always --flags=-bootstrap $ARG_COMPILER --disable-tests --disable-benchmarks happy | ||
| + $CABAL v2-install --reinstall --overwrite-policy=always $ARG_COMPILER --disable-tests --disable-benchmarks happy | ||
| - name: build | ||
| run: | | ||
| - $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always | ||
| + $CABAL v2-build --flags=-bootstrap $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always | ||
| $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always | ||
| - name: tests | ||
| run: | | ||
| - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct | ||
| + export HAPPY=$HOME/.cabal/bin/happy | ||
| + export HC | ||
| + export CABAL | ||
| + $CABAL v2-test --flags=-bootstrap $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct | ||
| + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct | ||
| - name: cabal check | ||
| run: | | ||
| cd ${PKGDIR_happy_frontend} || false | ||
| @@ -341,7 +346,7 @@ | ||
| - name: unconstrained build | ||
| run: | | ||
| rm -f cabal.project.local | ||
| - $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all | ||
| + $CABAL v2-build --flags=-bootstrap $ARG_COMPILER --disable-tests --disable-benchmarks all | ||
| - name: save cache | ||
| uses: actions/cache/save@v3 | ||
| if: always() | ||
| cd ${PKGDIR_happy_tabular} || false |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters