diff --git a/.github/workflows/caching.yml b/.github/workflows/caching.yml index 22dbaa045b..4848e819bd 100644 --- a/.github/workflows/caching.yml +++ b/.github/workflows/caching.yml @@ -100,7 +100,11 @@ jobs: - if: matrix.ghc == '9.0.1' name: (GHC 9.0.1) Use modified `cabal.project` run: | - cp cabal-ghc901.project cabal.project + # File has some protections preventing regular `rm`. + # (most probably sticky bit is set on $HOME) + # `&&` insures `rm -f` return is positive. + # Many platforms also have `alias cp='cp -i'`. + rm -f -v cabal.project && cp -v cabal-ghc901.project cabal.project - if: runner.os == 'Windows' && matrix.ghc == '8.8.4' name: (Windows,GHC 8.8) Modify `cabal.project` to workaround segfaults run: | @@ -154,11 +158,11 @@ jobs: ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc }}- ${{ env.cache-name }}-${{ runner.os }}- - - if: (! steps.compiled-deps.outputs.cache-hit) + - if: steps.compiled-deps.outputs.cache-hit != 'true' run: | cabal update - - if: (! steps.compiled-deps.outputs.cache-hit) + - if: steps.compiled-deps.outputs.cache-hit != 'true' name: Download all sources run: | cabal $cabalBuild --only-download @@ -168,7 +172,7 @@ jobs: # but to cache what can be cached, so step is fault tolerant & would always succseed. # 2021-12-11: NOTE: Building all targets, since # current Cabal does not allow `all --enable-tests --enable-benchmarks --only-dependencies` - - if: (! steps.compiled-deps.outputs.cache-hit) + - if: steps.compiled-deps.outputs.cache-hit != 'true' name: Build all targets; try 3 times continue-on-error: true run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e9a2984b32..549ac60185 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -95,7 +95,11 @@ jobs: - if: matrix.ghc == '9.0.1' name: (GHC 9.0.1) Use modified `cabal.project` run: | - cp cabal-ghc901.project cabal.project + # File has some protections preventing regular `rm`. + # (most probably sticky bit is set on $HOME) + # `&&` insures `rm -f` return is positive. + # Many platforms aslo have `alias cp='cp -i'`. + rm -f -v cabal.project && cp -v cabal-ghc901.project cabal.project - if: runner.os == 'Windows' && matrix.ghc == '8.8.4' name: (Windows,GHC 8.8) Modify `cabal.project` to workaround segfaults run: | diff --git a/cabal-ghc901.project b/cabal-ghc901.project index 043afcca75..c536524a45 100644 --- a/cabal-ghc901.project +++ b/cabal-ghc901.project @@ -37,7 +37,7 @@ package * write-ghc-environment-files: never -index-state: 2021-11-29T12:30:08Z +index-state: 2021-11-29T12:30:10Z constraints: -- These plugins don't work on GHC9 yet diff --git a/cabal-ghc921.project b/cabal-ghc921.project index 113087870a..fa7ced63d0 100644 --- a/cabal-ghc921.project +++ b/cabal-ghc921.project @@ -36,7 +36,7 @@ package * write-ghc-environment-files: never -index-state: 2021-11-29T12:30:08Z +index-state: 2021-11-29T12:30:10Z constraints: -- These plugins doesn't work on GHC92 yet diff --git a/cabal.project b/cabal.project index 7c70a8c62a..ffc53d8fae 100644 --- a/cabal.project +++ b/cabal.project @@ -40,7 +40,7 @@ package * write-ghc-environment-files: never -index-state: 2021-11-29T12:30:08Z +index-state: 2021-11-29T12:30:10Z constraints: hyphenation +embed