Skip to content

Commit 93f260a

Browse files
andreasabelandreasabel
committed
Bump CI to GHC 9.6.1 9.4.5 9.2.7
1 parent 1dae3f8 commit 93f260a

5 files changed

Lines changed: 32 additions & 43 deletions

File tree

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

Lines changed: 18 additions & 35 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.20230203
11+
# version: 0.16.1
1212
#
13-
# REGENDATA ("0.15.20230203",["github","hackage-cli.cabal"])
13+
# REGENDATA ("0.16.1",["github","hackage-cli.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,19 +32,19 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.6.0.20230128
35+
- compiler: ghc-9.6.1
3636
compilerKind: ghc
37-
compilerVersion: 9.6.0.20230128
37+
compilerVersion: 9.6.1
3838
setup-method: ghcup
39-
allow-failure: true
40-
- compiler: ghc-9.4.4
39+
allow-failure: false
40+
- compiler: ghc-9.4.5
4141
compilerKind: ghc
42-
compilerVersion: 9.4.4
42+
compilerVersion: 9.4.5
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.2.5
45+
- compiler: ghc-9.2.7
4646
compilerKind: ghc
47-
compilerVersion: 9.2.5
47+
compilerVersion: 9.2.7
4848
setup-method: ghcup
4949
allow-failure: false
5050
- compiler: ghc-9.0.2
@@ -85,22 +85,20 @@ jobs:
8585
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8686
if [ "${{ matrix.setup-method }}" = ghcup ]; then
8787
mkdir -p "$HOME/.ghcup/bin"
88-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
88+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
8989
chmod a+x "$HOME/.ghcup/bin/ghcup"
90-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
9190
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
92-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
91+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9392
apt-get update
9493
apt-get install -y libbrotli-dev
9594
else
9695
apt-add-repository -y 'ppa:hvr/ghc'
9796
apt-get update
9897
apt-get install -y "$HCNAME" libbrotli-dev
9998
mkdir -p "$HOME/.ghcup/bin"
100-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
99+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
101100
chmod a+x "$HOME/.ghcup/bin/ghcup"
102-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
103-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
101+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
104102
fi
105103
env:
106104
HCKIND: ${{ matrix.compilerKind }}
@@ -118,20 +116,20 @@ jobs:
118116
echo "HC=$HC" >> "$GITHUB_ENV"
119117
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
120118
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
121-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
119+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
122120
else
123121
HC=$HCDIR/bin/$HCKIND
124122
echo "HC=$HC" >> "$GITHUB_ENV"
125123
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
126124
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
127-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
125+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
128126
fi
129127
130128
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
131129
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
132130
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
133131
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
134-
if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
132+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
135133
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
136134
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
137135
env:
@@ -160,18 +158,6 @@ jobs:
160158
repository hackage.haskell.org
161159
url: http://hackage.haskell.org/
162160
EOF
163-
if $HEADHACKAGE; then
164-
cat >> $CABAL_CONFIG <<EOF
165-
repository head.hackage.ghc.haskell.org
166-
url: https://ghc.gitlab.haskell.org/head.hackage/
167-
secure: True
168-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
169-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
170-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
171-
key-threshold: 3
172-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
173-
EOF
174-
fi
175161
cat >> $CABAL_CONFIG <<EOF
176162
program-default-options
177163
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -188,8 +174,8 @@ jobs:
188174
- name: install cabal-plan
189175
run: |
190176
mkdir -p $HOME/.cabal/bin
191-
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
192-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
177+
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
178+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
193179
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
194180
rm -f cabal-plan.xz
195181
chmod a+x $HOME/.cabal/bin/cabal-plan
@@ -223,9 +209,6 @@ jobs:
223209
echo " ghc-options: -Werror=missing-methods" >> cabal.project
224210
cat >> cabal.project <<EOF
225211
EOF
226-
if $HEADHACKAGE; then
227-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
228-
fi
229212
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(Cabal|binary|hackage-cli)$/; }' >> cabal.project.local
230213
cat cabal.project
231214
cat cabal.project.local

‎.github/workflows/stack.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [ubuntu-latest]
17-
ghc-ver: [9.4.4, 9.2.6, 9.0.2, 8.10.7]
17+
ghc-ver: [9.4.5, 9.2.7, 9.0.2, 8.10.7]
1818
# On ubuntu-22.04 the old versions 8.8.4, 8.6.5, 8.4.4, 8.2.2 fail due to HsOpenSSL linking errors.
1919
# They used to work under ubuntu-20.04, but it is not worth the trouble maintaining them.
2020
# Apparently, HsOpenSSL-0.11.6 and older are too old for ubuntu-22.04.
2121
include:
2222
- os: macos-latest
23-
ghc-ver: 9.4.4
23+
ghc-ver: 9.4.5
2424
- os: windows-latest
25-
ghc-ver: 9.4.4
25+
ghc-ver: 9.4.5
2626
env:
2727
ARGS: "--stack-yaml=stack-${{ matrix.ghc-ver }}.yaml --no-terminal --system-ghc"
2828

‎hackage-cli.cabal‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ build-type: Simple
1818
-- Supported GHC versions when building with cabal:
1919
tested-with:
2020
-- Keep in descending order.
21-
GHC == 9.6.0
22-
GHC == 9.4.4
23-
GHC == 9.2.5
21+
GHC == 9.6.1
22+
GHC == 9.4.5
23+
GHC == 9.2.7
2424
GHC == 9.0.2
2525
GHC == 8.10.7
2626
GHC == 8.8.4
@@ -34,8 +34,8 @@ extra-source-files:
3434
fixtures/*.diff
3535
fixtures/*.cabal
3636
-- Supported GHC versions when building with stack:
37-
stack-9.4.4.yaml
38-
stack-9.2.6.yaml
37+
stack-9.4.5.yaml
38+
stack-9.2.7.yaml
3939
stack-9.0.2.yaml
4040
stack-8.10.7.yaml
4141

‎stack-9.2.7.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
resolver: lts-20.22
2+
compiler: ghc-9.2.7
3+
compiler-check: match-exact

‎stack-9.4.5.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
resolver: nightly-2023-05-23
2+
compiler: ghc-9.4.5
3+
compiler-check: match-exact

0 commit comments

Comments
 (0)