Skip to content

Commit 23513f7

Browse files
committed
update GH bootstrap and validate workflows to latest ghc minor versions
perhaps fix for haskell#8858 and haskell#8883
1 parent 1157461 commit 23513f7

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

.github/workflows/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
strategy:
2020
matrix:
2121
os: [ubuntu-latest]
22-
ghc: ["8.10.7", "9.0.2", "9.2.7", "9.4.4"]
22+
ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.7"]
2323
include:
2424
- os: macos-latest
25-
ghc: "9.2.7"
25+
ghc: "9.2.8"
2626
name: Bootstrap ${{ matrix.os }} ghc-${{ matrix.ghc }}
2727
runs-on: ${{ matrix.os }}
2828
steps:

.github/workflows/validate.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ on:
2323
env:
2424
# We choose a stable ghc version across all os's
2525
# which will be used to do the next release
26-
GHC_FOR_RELEASE: '9.2.7'
26+
GHC_FOR_RELEASE: '9.2.8'
2727
# Ideally we should use the version about to be released for hackage tests and benchmarks
28-
GHC_FOR_SOLVER_BENCHMARKS: '9.2.7'
29-
GHC_FOR_COMPLETE_HACKAGE_TESTS: '9.2.7'
28+
GHC_FOR_SOLVER_BENCHMARKS: '9.2.8'
29+
GHC_FOR_COMPLETE_HACKAGE_TESTS: '9.2.8'
3030
COMMON_FLAGS: '-j 2 -v'
3131

3232
jobs:
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
matrix:
4040
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
41-
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"]
41+
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"]
4242
exclude:
4343
# corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356
4444
- os: "windows-latest"
@@ -107,7 +107,7 @@ jobs:
107107
echo "FLAGS=$FLAGS" >> $GITHUB_ENV
108108
109109
- name: Allow newer dependencies when built with latest GHC
110-
if: ${{ matrix.ghc }} == '9.6.1'
110+
if: ${{ matrix.ghc }} == '9.6.3'
111111
run: |
112112
echo "allow-newer: rere:base, rere:transformers" >> cabal.project.validate
113113
@@ -158,18 +158,12 @@ jobs:
158158
run: sh validate.sh $FLAGS -s lib-tests
159159

160160
- name: Validate lib-suite
161-
# Have to disable *-suite validation:
162-
# - the [email protected] problem is tracked at https://github.com/haskell/cabal/issues/8858
163-
# - but curently can't run it with GHC 9.6, tracking: https://github.com/haskell/cabal/issues/8883
164-
if: (runner.os != 'Windows') || (matrix.ghc != '9.6.1')
165161
run: sh validate.sh $FLAGS -s lib-suite
166162

167163
- name: Validate cli-tests
168164
run: sh validate.sh $FLAGS -s cli-tests
169165

170166
- name: Validate cli-suite
171-
# Have to disable *-suite validation, see above the comment for lib-suite
172-
if: (runner.os != 'Windows') || (matrix.ghc != '9.6.1')
173167
run: sh validate.sh $FLAGS -s cli-suite
174168

175169
validate-old-ghcs:

0 commit comments

Comments
 (0)