From bd56fc17fc101bb718ff840486ce796e83f60389 Mon Sep 17 00:00:00 2001 From: Fendor Date: Sat, 26 Nov 2022 20:13:43 +0100 Subject: [PATCH 1/4] Bump gha versions in setup-build/action.yml --- .github/actions/setup-build/action.yml | 4 ++-- .github/workflows/test.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml index 0bc80aca7f..334e459a0a 100644 --- a/.github/actions/setup-build/action.yml +++ b/.github/actions/setup-build/action.yml @@ -23,7 +23,7 @@ inputs: runs: using: "composite" steps: - - uses: haskell/actions/setup@v1 + - uses: haskell/actions/setup@v2 id: HaskEnvSetup with: ghc-version : ${{ inputs.ghc }} @@ -74,7 +74,7 @@ runs: # We have to restore package sources before `cabal update` # because it overwrites the hackage index with the cached one - name: Hackage sources cache - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: hackage-sources with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fb9022e113..7874ca70c7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -115,7 +115,7 @@ jobs: run: | echo "TEST_OPTS=-j1 --rerun-update --rerun-filter failures,exceptions" >> $GITHUB_ENV - - name: Cache test log bewteen attempts of the same run + - name: Cache test log between attempts of the same run uses: actions/cache@v3 env: cache-name: cache-test-log From 0b35ea492a376a6109fe2e17c430ac271fd90e5a Mon Sep 17 00:00:00 2001 From: Fendor Date: Sat, 26 Nov 2022 20:24:36 +0100 Subject: [PATCH 2/4] Also bump cache for compiled-deps action --- .github/actions/setup-build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml index 334e459a0a..0b41e17f7a 100644 --- a/.github/actions/setup-build/action.yml +++ b/.github/actions/setup-build/action.yml @@ -99,7 +99,7 @@ runs: - name: Compiled deps cache id: compiled-deps - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: compiled-deps with: From 749c758a2d01db31f701485d1b8f3c01e44b2877 Mon Sep 17 00:00:00 2001 From: Fendor Date: Sat, 26 Nov 2022 20:59:27 +0100 Subject: [PATCH 3/4] Make sure caching is run for the same GHC versions as test.yml --- .github/workflows/caching.yml | 9 ++++++++- .github/workflows/test.yml | 14 +++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/caching.yml b/.github/workflows/caching.yml index b0887b51b9..b75a0cb71b 100644 --- a/.github/workflows/caching.yml +++ b/.github/workflows/caching.yml @@ -80,7 +80,11 @@ jobs: strategy: fail-fast: false matrix: - ghc: [ "9.2.4" + # This list of GHC versions must fit to the list of GHC versions + # specified in 'test.yml' + ghc: [ "9.4.2" + , "9.4.1" + , "9.2.4" , "9.2.3" , "9.0.2" , "8.10.7" @@ -89,6 +93,9 @@ jobs: , "macOS-latest" , "windows-latest" ] + exclude: + - os: windows-latest + ghc: '9.4.1' steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7874ca70c7..9385f5af36 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,6 +56,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: fail-fast: true + # when you edit this list of GHC versions, + # **don't forget** + # to update the ghc versions in 'caching.yml'. matrix: ghc: [ "9.4.2" , "9.4.1" @@ -66,7 +69,15 @@ jobs: ] os: [ "ubuntu-latest" , "macOS-latest" + , "windows-latest" ] + # don't build these versions + # they are broken for good reasons, e.g. compiler is bugged + # on that platform. + exclude: + - os: windows-latest + ghc: '9.4.1' + # Mark which GHC versions on which platform we want to test. include: # only test supported ghc major versions - os: ubuntu-latest @@ -93,9 +104,6 @@ jobs: - os: windows-latest ghc: '8.10.7' test: true - # only build rest of supported ghc versions for windows - - os: windows-latest - ghc: '9.2.3' steps: - uses: actions/checkout@v3 From 90ab6e2a08809186a7446b4a77f53cf0800cfee5 Mon Sep 17 00:00:00 2001 From: Fendor Date: Mon, 28 Nov 2022 14:35:26 +0100 Subject: [PATCH 4/4] Specify a GHC in pre-commit.yml --- .github/workflows/pre-commit.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 43122276fa..0136d48441 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -26,6 +26,8 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-build with: + # select a stable GHC version + ghc: 9.2.5 os: ${{ runner.os }} shorten-hls: false