Skip to content

Commit f05f5d6

Browse files
committed
Regenerate CI
1 parent a0d25af commit f05f5d6

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20250821
11+
# version: 0.19.20251211
1212
#
13-
# REGENDATA ("0.19.20250821",["github","cabal.project"])
13+
# REGENDATA ("0.19.20251211",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
1717
- push
1818
- pull_request
19+
- merge_group
1920
jobs:
2021
linux:
2122
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -28,19 +29,19 @@ jobs:
2829
strategy:
2930
matrix:
3031
include:
31-
- compiler: ghc-9.14.0.20250819
32+
- compiler: ghc-9.14.0.20251128
3233
compilerKind: ghc
33-
compilerVersion: 9.14.0.20250819
34+
compilerVersion: 9.14.0.20251128
3435
setup-method: ghcup-prerelease
3536
allow-failure: false
3637
- compiler: ghc-9.12.2
3738
compilerKind: ghc
3839
compilerVersion: 9.12.2
3940
setup-method: ghcup
4041
allow-failure: false
41-
- compiler: ghc-9.10.2
42+
- compiler: ghc-9.10.3
4243
compilerKind: ghc
43-
compilerVersion: 9.10.2
44+
compilerVersion: 9.10.3
4445
setup-method: ghcup
4546
allow-failure: false
4647
- compiler: ghc-9.8.4
@@ -216,7 +217,7 @@ jobs:
216217
chmod a+x $HOME/.cabal/bin/cabal-plan
217218
cabal-plan --version
218219
- name: checkout
219-
uses: actions/checkout@v4
220+
uses: actions/checkout@v5
220221
with:
221222
path: source
222223
- name: initial cabal.project for sdist

.github/workflows/other.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,11 @@ jobs:
1515
matrix:
1616
os: [windows-latest, macOS-latest]
1717
ghc: ['9.2', '9.4', '9.6', '9.8', 'latest']
18-
## macos-14 (arm, as of 2024-05-03 macos-latest) fails with ghc <= 9.0
1918
include:
2019
- os: windows-latest
2120
ghc: '8.0'
22-
- os: macos-13
23-
ghc: '8.0'
2421
- os: windows-latest
2522
ghc: '8.2'
26-
- os: macos-13
27-
ghc: '8.2'
2823
steps:
2924
- uses: actions/checkout@v4
3025
- uses: haskell-actions/setup@v2

zlib-clib/zlib-clib.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ tested-with: GHC == 8.0.2
2626
, GHC == 9.4.8
2727
, GHC == 9.6.7
2828
, GHC == 9.8.4
29-
, GHC == 9.10.2
29+
, GHC == 9.10.3
3030
, GHC == 9.12.2
3131
, GHC == 9.14.1
3232

zlib/zlib.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ tested-with: GHC == 8.0.2
3333
, GHC == 9.4.8
3434
, GHC == 9.6.7
3535
, GHC == 9.8.4
36-
, GHC == 9.10.2
36+
, GHC == 9.10.3
3737
, GHC == 9.12.2
3838
, GHC == 9.14.1
3939

0 commit comments

Comments
 (0)