Skip to content

Commit 81128bd

Browse files
phadejphadej
authored
Merge pull request #604 from haskell-CI/ghc-9.4.1
GHC-9.4.1 has been released
2 parents 5768a7e + bdef3bc commit 81128bd

File tree

7 files changed

+11
-87
lines changed

7 files changed

+11
-87
lines changed

‎fixtures/all-versions.github‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ jobs:
3333
compilerVersion: "8.4"
3434
setup-method: hvr-ppa
3535
allow-failure: false
36-
- compiler: ghc-9.4.0.20220721
36+
- compiler: ghc-9.4.1
3737
compilerKind: ghc
38-
compilerVersion: 9.4.0.20220721
38+
compilerVersion: 9.4.1
3939
setup-method: ghcup
40-
allow-failure: true
40+
allow-failure: false
4141
- compiler: ghc-9.2.4
4242
compilerKind: ghc
4343
compilerVersion: 9.2.4
@@ -301,7 +301,6 @@ jobs:
301301
mkdir -p "$HOME/.ghcup/bin"
302302
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
303303
chmod a+x "$HOME/.ghcup/bin/ghcup"
304-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
305304
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
306305
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
307306
else
@@ -346,7 +345,7 @@ jobs:
346345
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
347346
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
348347
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
349-
if [ $((! GHCJSARITH && HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
348+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
350349
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
351350
env:
352351
HCKIND: ${{ matrix.compilerKind }}
@@ -374,18 +373,6 @@ jobs:
374373
repository hackage.haskell.org
375374
url: http://hackage.haskell.org/
376375
EOF
377-
if $HEADHACKAGE; then
378-
cat >> $CABAL_CONFIG <<EOF
379-
repository head.hackage.ghc.haskell.org
380-
url: https://ghc.gitlab.haskell.org/head.hackage/
381-
secure: True
382-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
383-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
384-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
385-
key-threshold: 3
386-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
387-
EOF
388-
fi
389376
cat >> $CABAL_CONFIG <<EOF
390377
program-default-options
391378
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -439,9 +426,6 @@ jobs:
439426
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
440427
cat >> cabal.project <<EOF
441428
EOF
442-
if $HEADHACKAGE; then
443-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
444-
fi
445429
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
446430
cat cabal.project
447431
cat cabal.project.local

‎fixtures/all-versions.travis‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,6 @@ jobs:
183183
- compiler: ghc-7.0.1
184184
addons: {"apt":{"packages":["ghc-7.0.1","cabal-install-3.6"],"sources":[{"key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286","sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main"}]}}
185185
os: linux
186-
allow_failures:
187-
- compiler: ghc-9.4.1
188186
before_install:
189187
- |
190188
if echo $CC | grep -q ghcjs; then
@@ -211,7 +209,6 @@ before_install:
211209
- TEST=--enable-tests
212210
- BENCH=--enable-benchmarks
213211
- HEADHACKAGE=false
214-
- if [ $((! GHCJSARITH && HCNUMVER >= 90400)) -ne 0 ] ; then HEADHACKAGE=true ; fi
215212
- rm -f $CABALHOME/config
216213
- |
217214
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
@@ -229,17 +226,6 @@ before_install:
229226
echo " prefix: $CABALHOME" >> $CABALHOME/config
230227
echo "repository hackage.haskell.org" >> $CABALHOME/config
231228
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
232-
- |
233-
if $HEADHACKAGE; then
234-
echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config
235-
echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config
236-
echo " secure: True" >> $CABALHOME/config
237-
echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config
238-
echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config
239-
echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
240-
echo " key-threshold: 3" >> $CABALHOME/config
241-
echo "active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override" >> $CABALHOME/config
242-
fi
243229
install:
244230
- ${CABAL} --version
245231
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
@@ -259,10 +245,6 @@ install:
259245
- if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
260246
- "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
261247
- ""
262-
- |
263-
if $HEADHACKAGE; then
264-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
265-
fi
266248
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(splitmix)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
267249
- cat cabal.project || true
268250
- cat cabal.project.local || true
@@ -290,10 +272,6 @@ script:
290272
- if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
291273
- "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
292274
- ""
293-
- |
294-
if $HEADHACKAGE; then
295-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
296-
fi
297275
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(splitmix)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
298276
- cat cabal.project || true
299277
- cat cabal.project.local || true

‎fixtures/enabled-jobs.github‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ jobs:
3333
compilerVersion: "8.4"
3434
setup-method: hvr-ppa
3535
allow-failure: false
36-
- compiler: ghc-9.4.0.20220721
36+
- compiler: ghc-9.4.1
3737
compilerKind: ghc
38-
compilerVersion: 9.4.0.20220721
38+
compilerVersion: 9.4.1
3939
setup-method: ghcup
40-
allow-failure: true
40+
allow-failure: false
4141
- compiler: ghc-9.2.4
4242
compilerKind: ghc
4343
compilerVersion: 9.2.4
@@ -211,7 +211,6 @@ jobs:
211211
mkdir -p "$HOME/.ghcup/bin"
212212
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
213213
chmod a+x "$HOME/.ghcup/bin/ghcup"
214-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
215214
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
216215
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
217216
else
@@ -256,7 +255,7 @@ jobs:
256255
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
257256
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
258257
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
259-
if [ $((! GHCJSARITH && HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
258+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
260259
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
261260
env:
262261
HCKIND: ${{ matrix.compilerKind }}
@@ -284,18 +283,6 @@ jobs:
284283
repository hackage.haskell.org
285284
url: http://hackage.haskell.org/
286285
EOF
287-
if $HEADHACKAGE; then
288-
cat >> $CABAL_CONFIG <<EOF
289-
repository head.hackage.ghc.haskell.org
290-
url: https://ghc.gitlab.haskell.org/head.hackage/
291-
secure: True
292-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
293-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
294-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
295-
key-threshold: 3
296-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
297-
EOF
298-
fi
299286
cat >> $CABAL_CONFIG <<EOF
300287
program-default-options
301288
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -349,9 +336,6 @@ jobs:
349336
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
350337
cat >> cabal.project <<EOF
351338
EOF
352-
if $HEADHACKAGE; then
353-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
354-
fi
355339
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
356340
cat cabal.project
357341
cat cabal.project.local

‎fixtures/enabled-jobs.travis‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ jobs:
129129
- compiler: ghc-8.0.1
130130
addons: {"apt":{"packages":["ghc-8.0.1","cabal-install-3.6"],"sources":[{"key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286","sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main"}]}}
131131
os: linux
132-
allow_failures:
133-
- compiler: ghc-9.4.1
134132
before_install:
135133
- |
136134
if echo $CC | grep -q ghcjs; then
@@ -157,7 +155,6 @@ before_install:
157155
- TEST=--enable-tests
158156
- BENCH=--enable-benchmarks
159157
- HEADHACKAGE=false
160-
- if [ $((! GHCJSARITH && HCNUMVER >= 90400)) -ne 0 ] ; then HEADHACKAGE=true ; fi
161158
- rm -f $CABALHOME/config
162159
- |
163160
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
@@ -175,17 +172,6 @@ before_install:
175172
echo " prefix: $CABALHOME" >> $CABALHOME/config
176173
echo "repository hackage.haskell.org" >> $CABALHOME/config
177174
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
178-
- |
179-
if $HEADHACKAGE; then
180-
echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config
181-
echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config
182-
echo " secure: True" >> $CABALHOME/config
183-
echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config
184-
echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config
185-
echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
186-
echo " key-threshold: 3" >> $CABALHOME/config
187-
echo "active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override" >> $CABALHOME/config
188-
fi
189175
install:
190176
- ${CABAL} --version
191177
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
@@ -205,10 +191,6 @@ install:
205191
- if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
206192
- "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
207193
- ""
208-
- |
209-
if $HEADHACKAGE; then
210-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
211-
fi
212194
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(splitmix)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
213195
- cat cabal.project || true
214196
- cat cabal.project.local || true
@@ -236,10 +218,6 @@ script:
236218
- if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
237219
- "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
238220
- ""
239-
- |
240-
if $HEADHACKAGE; then
241-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
242-
fi
243221
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(splitmix)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
244222
- cat cabal.project || true
245223
- cat cabal.project.local || true

‎haskell-ci.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: haskell-ci
3-
version: 0.15.20220730
3+
version: 0.15.20220808
44
synopsis: Cabal package script generator for Travis-CI
55
description:
66
Script generator (@haskell-ci@) for

‎src/HaskellCI/Compiler.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ dispCabalVersion :: Maybe Version -> String
182182
dispCabalVersion = maybe "head" C.prettyShow
183183

184184
ghcAlpha :: Maybe (Version, Version)
185-
ghcAlpha = Just (mkVersion [9,4,1], mkVersion [9,4,0,20220721])
185+
ghcAlpha = Nothing
186186

187187
-- | Alphas, RCs and HEAD.
188188
previewGHC

‎src/HaskellCI/HeadHackage.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import HaskellCI.Prelude
55
import qualified Distribution.Version as C
66

77
defaultHeadHackage :: VersionRange
8-
defaultHeadHackage = C.orLaterVersion (C.mkVersion [9,3])
8+
defaultHeadHackage = C.orLaterVersion (C.mkVersion [9,5])
99

1010
headHackageRepoStanza :: Bool -> [String]
1111
headHackageRepoStanza override =

0 commit comments

Comments
 (0)