Skip to content

Commit 0dbe06b

Browse files
authored
Merge pull request #986 from haskell/ci-ghc-bump
GHC-9.2.5 and 9.4.4 in CI
2 parents 15eea59 + 700fae8 commit 0dbe06b

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.15.20220808
11+
# version: 0.15.20230115
1212
#
13-
# REGENDATA ("0.15.20220808",["github","cabal.project"])
13+
# REGENDATA ("0.15.20230115",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,14 +32,14 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.4.1
35+
- compiler: ghc-9.4.4
3636
compilerKind: ghc
37-
compilerVersion: 9.4.1
37+
compilerVersion: 9.4.4
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.2.4
40+
- compiler: ghc-9.2.5
4141
compilerKind: ghc
42-
compilerVersion: 9.2.4
42+
compilerVersion: 9.2.5
4343
setup-method: ghcup
4444
allow-failure: false
4545
- compiler: ghc-9.0.2
@@ -172,7 +172,7 @@ jobs:
172172
- name: cache (tools)
173173
uses: actions/cache@v2
174174
with:
175-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-9f99e33a
175+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-cd9045c2
176176
path: ~/.haskell-ci-tools
177177
- name: install cabal-plan
178178
run: |

.github/workflows/z-bench.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.15.20220609
11+
# version: 0.15.20230115
1212
#
13-
# REGENDATA ("0.15.20220609",["github","-o",".github/workflows/z-bench.yml","--config=cabal.bench.haskell-ci","--project","cabal.bench.project"])
13+
# REGENDATA ("0.15.20230115",["github","-o",".github/workflows/z-bench.yml","--config=cabal.bench.haskell-ci","--project","cabal.bench.project"])
1414
#
1515
name: Z Bench CI
1616
on:
@@ -32,9 +32,9 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.2.2
35+
- compiler: ghc-9.2.5
3636
compilerKind: ghc
37-
compilerVersion: 9.2.2
37+
compilerVersion: 9.2.5
3838
setup-method: ghcup
3939
allow-failure: false
4040
- compiler: ghc-9.0.2
@@ -80,7 +80,7 @@ jobs:
8080
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8181
if [ "${{ matrix.setup-method }}" = ghcup ]; then
8282
mkdir -p "$HOME/.ghcup/bin"
83-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
83+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
8484
chmod a+x "$HOME/.ghcup/bin/ghcup"
8585
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
8686
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
@@ -89,7 +89,7 @@ jobs:
8989
apt-get update
9090
apt-get install -y "$HCNAME"
9191
mkdir -p "$HOME/.ghcup/bin"
92-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
92+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
9393
chmod a+x "$HOME/.ghcup/bin/ghcup"
9494
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9595
fi

aeson.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ tested-with:
1818
|| ==8.8.4
1919
|| ==8.10.7
2020
|| ==9.0.2
21-
|| ==9.2.4
22-
|| ==9.4.1
21+
|| ==9.2.5
22+
|| ==9.4.4
2323

2424
synopsis: Fast JSON parsing and encoding
2525
cabal-version: >=1.10

attoparsec-iso8601/attoparsec-iso8601.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ cabal-version: >=1.10
1414
homepage: https://github.com/haskell/aeson
1515
bug-reports: https://github.com/haskell/aeson/issues
1616
build-type: Simple
17-
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC ==9.2.4, GHC==9.4.1
17+
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC ==9.2.5, GHC==9.4.4
1818
extra-source-files:
1919
README.md
2020
changelog.md

benchmarks/aeson-benchmarks.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ tested-with:
1010
|| ==8.8.4
1111
|| ==8.10.7
1212
|| ==9.0.2
13-
|| ==9.2.2
13+
|| ==9.2.5
1414

1515
extra-source-files: cbits/*.c
1616

examples/aeson-examples.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ tested-with:
1616
|| ==8.8.4
1717
|| ==8.10.7
1818
|| ==9.0.2
19-
|| ==9.2.4
20-
|| ==9.4.1
19+
|| ==9.2.5
20+
|| ==9.4.4
2121

2222
library twitter-generic
2323
default-language: Haskell2010

0 commit comments

Comments
 (0)