From 23513f725af87b57aac119da3ee1d56060549a23 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 3 Nov 2023 17:57:04 +0800 Subject: [PATCH] update GH bootstrap and validate workflows to latest ghc minor versions perhaps fix for #8858 and #8883 --- .github/workflows/bootstrap.yml | 4 ++-- .github/workflows/validate.yml | 16 +++++----------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index c1734736e4c..82d648e44da 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -19,10 +19,10 @@ jobs: strategy: matrix: os: [ubuntu-latest] - ghc: ["8.10.7", "9.0.2", "9.2.7", "9.4.4"] + ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.7"] include: - os: macos-latest - ghc: "9.2.7" + ghc: "9.2.8" name: Bootstrap ${{ matrix.os }} ghc-${{ matrix.ghc }} runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index b1fc53a2352..b6cc0958e0f 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -23,10 +23,10 @@ on: env: # We choose a stable ghc version across all os's # which will be used to do the next release - GHC_FOR_RELEASE: '9.2.7' + GHC_FOR_RELEASE: '9.2.8' # Ideally we should use the version about to be released for hackage tests and benchmarks - GHC_FOR_SOLVER_BENCHMARKS: '9.2.7' - GHC_FOR_COMPLETE_HACKAGE_TESTS: '9.2.7' + GHC_FOR_SOLVER_BENCHMARKS: '9.2.8' + GHC_FOR_COMPLETE_HACKAGE_TESTS: '9.2.8' COMMON_FLAGS: '-j 2 -v' jobs: @@ -38,7 +38,7 @@ jobs: strategy: matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] - ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"] + ghc: ["9.6.3", "9.4.7", "9.2.8", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"] exclude: # corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356 - os: "windows-latest" @@ -107,7 +107,7 @@ jobs: echo "FLAGS=$FLAGS" >> $GITHUB_ENV - name: Allow newer dependencies when built with latest GHC - if: ${{ matrix.ghc }} == '9.6.1' + if: ${{ matrix.ghc }} == '9.6.3' run: | echo "allow-newer: rere:base, rere:transformers" >> cabal.project.validate @@ -158,18 +158,12 @@ jobs: run: sh validate.sh $FLAGS -s lib-tests - name: Validate lib-suite - # Have to disable *-suite validation: - # - the Windows@9.6.1 problem is tracked at https://github.com/haskell/cabal/issues/8858 - # - but curently can't run it with GHC 9.6, tracking: https://github.com/haskell/cabal/issues/8883 - if: (runner.os != 'Windows') || (matrix.ghc != '9.6.1') run: sh validate.sh $FLAGS -s lib-suite - name: Validate cli-tests run: sh validate.sh $FLAGS -s cli-tests - name: Validate cli-suite - # Have to disable *-suite validation, see above the comment for lib-suite - if: (runner.os != 'Windows') || (matrix.ghc != '9.6.1') run: sh validate.sh $FLAGS -s cli-suite validate-old-ghcs: