Skip to content

Commit cee2172

Browse files
committed
CI: bump GHC 9.4 to 9.4.8
1 parent 4f43962 commit cee2172

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

.github/workflows/haskell-ci-simple.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
os: [ubuntu-latest, macOS-latest, windows-latest]
25+
os: [ubuntu-latest]
2626
ghc:
2727
- "8.0.2"
2828
# Andreas, 2023-06-20, reduce CI load, keep only extremal GHC versions
@@ -33,9 +33,15 @@ jobs:
3333
# - "8.10.7"
3434
# - "9.0.2"
3535
# - "9.2.8"
36-
- "9.4.7"
36+
- "9.4.8"
3737
- "9.6.3"
3838
- "9.8.1"
39+
include:
40+
- ghc: "9.8.1"
41+
os: macos-latest
42+
- ghc: "9.8.1"
43+
os: windows-latest
44+
3945
steps:
4046
- uses: actions/checkout@v4
4147

.github/workflows/haskell-ci.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.17.20231012
11+
# version: 0.17.20231112
1212
#
13-
# REGENDATA ("0.17.20231012",["github","alex.cabal"])
13+
# REGENDATA ("0.17.20231112",["github","alex.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -46,9 +46,9 @@ jobs:
4646
compilerVersion: 9.6.3
4747
setup-method: ghcup
4848
allow-failure: false
49-
- compiler: ghc-9.4.7
49+
- compiler: ghc-9.4.8
5050
compilerKind: ghc
51-
compilerVersion: 9.4.7
51+
compilerVersion: 9.4.8
5252
setup-method: ghcup
5353
allow-failure: false
5454
- compiler: ghc-9.2.8
@@ -98,11 +98,10 @@ jobs:
9898
apt-get update
9999
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
100100
mkdir -p "$HOME/.ghcup/bin"
101-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
101+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
102102
chmod a+x "$HOME/.ghcup/bin/ghcup"
103-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
104103
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
105-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
104+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
106105
env:
107106
HCKIND: ${{ matrix.compilerKind }}
108107
HCNAME: ${{ matrix.compiler }}
@@ -120,7 +119,7 @@ jobs:
120119
echo "HC=$HC" >> "$GITHUB_ENV"
121120
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
122121
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
123-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
122+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
124123
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
125124
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
126125
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

alex.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ build-type: Simple
2424
tested-with:
2525
GHC == 9.8.1
2626
GHC == 9.6.3
27-
GHC == 9.4.7
27+
GHC == 9.4.8
2828
GHC == 9.2.8
2929
GHC == 9.0.2
3030
GHC == 8.10.7

0 commit comments

Comments
 (0)