Skip to content

Commit 3893154

Browse files
authored
Bump gha versions in setup-build/action.yml (#3366)
* Bump gha versions in setup-build/action.yml * Also bump cache for compiled-deps action * Make sure caching is run for the same GHC versions as test.yml * Specify a GHC in pre-commit.yml
1 parent aeb57a8 commit 3893154

File tree

4 files changed

+25
-8
lines changed

4 files changed

+25
-8
lines changed

.github/actions/setup-build/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ inputs:
2323
runs:
2424
using: "composite"
2525
steps:
26-
- uses: haskell/actions/setup@v1
26+
- uses: haskell/actions/setup@v2
2727
id: HaskEnvSetup
2828
with:
2929
ghc-version : ${{ inputs.ghc }}
@@ -74,7 +74,7 @@ runs:
7474
# We have to restore package sources before `cabal update`
7575
# because it overwrites the hackage index with the cached one
7676
- name: Hackage sources cache
77-
uses: actions/cache@v2
77+
uses: actions/cache@v3
7878
env:
7979
cache-name: hackage-sources
8080
with:
@@ -99,7 +99,7 @@ runs:
9999

100100
- name: Compiled deps cache
101101
id: compiled-deps
102-
uses: actions/cache@v2
102+
uses: actions/cache@v3
103103
env:
104104
cache-name: compiled-deps
105105
with:

.github/workflows/caching.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ jobs:
8080
strategy:
8181
fail-fast: false
8282
matrix:
83-
ghc: [ "9.2.4"
83+
# This list of GHC versions must fit to the list of GHC versions
84+
# specified in 'test.yml'
85+
ghc: [ "9.4.2"
86+
, "9.4.1"
87+
, "9.2.4"
8488
, "9.2.3"
8589
, "9.0.2"
8690
, "8.10.7"
@@ -89,6 +93,9 @@ jobs:
8993
, "macOS-latest"
9094
, "windows-latest"
9195
]
96+
exclude:
97+
- os: windows-latest
98+
ghc: '9.4.1'
9299

93100
steps:
94101
- uses: actions/checkout@v3

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
- uses: actions/checkout@v3
2727
- uses: ./.github/actions/setup-build
2828
with:
29+
# select a stable GHC version
30+
ghc: 9.2.5
2931
os: ${{ runner.os }}
3032
shorten-hls: false
3133

.github/workflows/test.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ jobs:
5656
runs-on: ${{ matrix.os }}
5757
strategy:
5858
fail-fast: true
59+
# when you edit this list of GHC versions,
60+
# **don't forget**
61+
# to update the ghc versions in 'caching.yml'.
5962
matrix:
6063
ghc: [ "9.4.2"
6164
, "9.4.1"
@@ -66,7 +69,15 @@ jobs:
6669
]
6770
os: [ "ubuntu-latest"
6871
, "macOS-latest"
72+
, "windows-latest"
6973
]
74+
# don't build these versions
75+
# they are broken for good reasons, e.g. compiler is bugged
76+
# on that platform.
77+
exclude:
78+
- os: windows-latest
79+
ghc: '9.4.1'
80+
# Mark which GHC versions on which platform we want to test.
7081
include:
7182
# only test supported ghc major versions
7283
- os: ubuntu-latest
@@ -93,9 +104,6 @@ jobs:
93104
- os: windows-latest
94105
ghc: '8.10.7'
95106
test: true
96-
# only build rest of supported ghc versions for windows
97-
- os: windows-latest
98-
ghc: '9.2.3'
99107

100108
steps:
101109
- uses: actions/checkout@v3
@@ -115,7 +123,7 @@ jobs:
115123
run: |
116124
echo "TEST_OPTS=-j1 --rerun-update --rerun-filter failures,exceptions" >> $GITHUB_ENV
117125
118-
- name: Cache test log bewteen attempts of the same run
126+
- name: Cache test log between attempts of the same run
119127
uses: actions/cache@v3
120128
env:
121129
cache-name: cache-test-log

0 commit comments

Comments
 (0)