Skip to content

Commit 620e2d6

Browse files
phadejphadej
authored
Merge pull request #962 from haskell/ghc-9.4
Support GHC-9.4
2 parents fa1370c + 468e9d9 commit 620e2d6

File tree

5 files changed

+20
-35
lines changed

5 files changed

+20
-35
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 13 additions & 29 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.20220808
1212
#
13-
# REGENDATA ("0.15.20220609",["github","cabal.project"])
13+
# REGENDATA ("0.15.20220808",["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.0.20220523
35+
- compiler: ghc-9.4.1
3636
compilerKind: ghc
37-
compilerVersion: 9.4.0.20220523
37+
compilerVersion: 9.4.1
3838
setup-method: ghcup
39-
allow-failure: true
40-
- compiler: ghc-9.2.3
39+
allow-failure: false
40+
- compiler: ghc-9.2.4
4141
compilerKind: ghc
42-
compilerVersion: 9.2.3
42+
compilerVersion: 9.2.4
4343
setup-method: ghcup
4444
allow-failure: false
4545
- compiler: ghc-9.0.2
@@ -85,17 +85,16 @@ 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.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
88+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
8989
chmod a+x "$HOME/.ghcup/bin/ghcup"
90-
if $HEADHACKAGE; then "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml; fi
9190
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
9291
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9392
else
9493
apt-add-repository -y 'ppa:hvr/ghc'
9594
apt-get update
9695
apt-get install -y "$HCNAME"
9796
mkdir -p "$HOME/.ghcup/bin"
98-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
97+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
9998
chmod a+x "$HOME/.ghcup/bin/ghcup"
10099
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
101100
fi
@@ -128,7 +127,7 @@ jobs:
128127
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
129128
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
130129
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
131-
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
130+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
132131
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
133132
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
134133
env:
@@ -157,18 +156,6 @@ jobs:
157156
repository hackage.haskell.org
158157
url: http://hackage.haskell.org/
159158
EOF
160-
if $HEADHACKAGE; then
161-
cat >> $CABAL_CONFIG <<EOF
162-
repository head.hackage.ghc.haskell.org
163-
url: https://ghc.gitlab.haskell.org/head.hackage/
164-
secure: True
165-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
166-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
167-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
168-
key-threshold: 3
169-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
170-
EOF
171-
fi
172159
cat >> $CABAL_CONFIG <<EOF
173160
program-default-options
174161
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -237,9 +224,6 @@ jobs:
237224
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
238225
cat >> cabal.project <<EOF
239226
EOF
240-
if $HEADHACKAGE; then
241-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
242-
fi
243227
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(aeson|aeson-examples|attoparsec-iso8601)$/; }' >> cabal.project.local
244228
cat cabal.project
245229
cat cabal.project.local
@@ -283,9 +267,9 @@ jobs:
283267
$CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=2.0' all
284268
- name: constraint set text-1.2
285269
run: |
286-
$CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=1.2.3.0' --dependencies-only -j2 all
287-
$CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=1.2.3.0' all
288-
$CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=1.2.3.0' all
270+
if [ $((HCNUMVER < 90400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=1.2.3.0' --dependencies-only -j2 all ; fi
271+
if [ $((HCNUMVER < 90400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=1.2.3.0' all ; fi
272+
if [ $((HCNUMVER < 90400)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=1.2.3.0' all ; fi
289273
- name: constraint set bytestring-0.11.2.0
290274
run: |
291275
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='bytestring >= 0.11.2.0' --dependencies-only -j2 all

‎aeson.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: aeson
22
version: 2.1.0.0
3-
x-revision: 1
3+
x-revision: 2
44
license: BSD3
55
license-file: LICENSE
66
category: Text, Web, JSON
@@ -19,7 +19,7 @@ tested-with:
1919
|| ==8.8.4
2020
|| ==8.10.7
2121
|| ==9.0.2
22-
|| ==9.2.3
22+
|| ==9.2.4
2323
|| ==9.4.1
2424

2525
synopsis: Fast JSON parsing and encoding
@@ -100,8 +100,8 @@ library
100100
, bytestring >=0.10.8.1 && <0.12
101101
, containers >=0.5.7.1 && <0.7
102102
, deepseq >=1.4.2.0 && <1.5
103-
, ghc-prim >=0.5.0.0 && <0.9
104-
, template-haskell >=2.11.0.0 && <2.19
103+
, ghc-prim >=0.5.0.0 && <0.10
104+
, template-haskell >=2.11.0.0 && <2.20
105105
, text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
106106
, time >=1.6.0.1 && <1.13
107107

‎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.3, 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.4, GHC==9.4.1
1818
extra-source-files:
1919
README.md
2020
changelog.md

‎cabal.haskell-ci

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ constraint-set bytestring-0.11.2.0
2828
constraints: bytestring >= 0.11.2.0
2929

3030
constraint-set text-1.2
31+
ghc: <9.4
3132
constraints: text ^>=1.2.3.0
3233
tests: True
3334
run-tests: True

‎examples/aeson-examples.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ tested-with:
1616
|| ==8.8.4
1717
|| ==8.10.7
1818
|| ==9.0.2
19-
|| ==9.2.3
19+
|| ==9.2.4
2020
|| ==9.4.1
2121

2222
library twitter-generic

0 commit comments

Comments
 (0)