Skip to content

Commit b5e981b

Browse files
phadejphadej
authored
Merge pull request #726 from haskell-CI/bump-head-hackage
head.hackage >=9.11
2 parents 07deeb7 + 41bb431 commit b5e981b

File tree

10 files changed

+6
-146
lines changed

10 files changed

+6
-146
lines changed

‎fixtures/all-versions.github‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ jobs:
352352
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
353353
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
354354
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
355-
if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
355+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
356356
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
357357
env:
358358
HCKIND: ${{ matrix.compilerKind }}
@@ -380,18 +380,6 @@ jobs:
380380
repository hackage.haskell.org
381381
url: http://hackage.haskell.org/
382382
EOF
383-
if $HEADHACKAGE; then
384-
cat >> $CABAL_CONFIG <<EOF
385-
repository head.hackage.ghc.haskell.org
386-
url: https://ghc.gitlab.haskell.org/head.hackage/
387-
secure: True
388-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
389-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
390-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
391-
key-threshold: 3
392-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
393-
EOF
394-
fi
395383
cat >> $CABAL_CONFIG <<EOF
396384
program-default-options
397385
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -445,9 +433,6 @@ jobs:
445433
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
446434
cat >> cabal.project <<EOF
447435
EOF
448-
if $HEADHACKAGE; then
449-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
450-
fi
451436
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
452437
cat cabal.project
453438
cat cabal.project.local

‎fixtures/all-versions.travis‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ before_install:
212212
- TEST=--enable-tests
213213
- BENCH=--enable-benchmarks
214214
- HEADHACKAGE=false
215-
- if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then HEADHACKAGE=true ; fi
216215
- rm -f $CABALHOME/config
217216
- |
218217
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
@@ -230,17 +229,6 @@ before_install:
230229
echo " prefix: $CABALHOME" >> $CABALHOME/config
231230
echo "repository hackage.haskell.org" >> $CABALHOME/config
232231
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
233-
- |
234-
if $HEADHACKAGE; then
235-
echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config
236-
echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config
237-
echo " secure: True" >> $CABALHOME/config
238-
echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config
239-
echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config
240-
echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
241-
echo " key-threshold: 3" >> $CABALHOME/config
242-
echo "active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override" >> $CABALHOME/config
243-
fi
244232
install:
245233
- ${CABAL} --version
246234
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
@@ -260,10 +248,6 @@ install:
260248
- if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
261249
- "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
262250
- ""
263-
- |
264-
if $HEADHACKAGE; then
265-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
266-
fi
267251
- "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"
268252
- cat cabal.project || true
269253
- cat cabal.project.local || true
@@ -291,10 +275,6 @@ script:
291275
- if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
292276
- "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
293277
- ""
294-
- |
295-
if $HEADHACKAGE; then
296-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
297-
fi
298278
- "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"
299279
- cat cabal.project || true
300280
- cat cabal.project.local || true

‎fixtures/doctest-version.github‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ jobs:
352352
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
353353
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
354354
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
355-
if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
355+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
356356
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
357357
env:
358358
HCKIND: ${{ matrix.compilerKind }}
@@ -380,18 +380,6 @@ jobs:
380380
repository hackage.haskell.org
381381
url: http://hackage.haskell.org/
382382
EOF
383-
if $HEADHACKAGE; then
384-
cat >> $CABAL_CONFIG <<EOF
385-
repository head.hackage.ghc.haskell.org
386-
url: https://ghc.gitlab.haskell.org/head.hackage/
387-
secure: True
388-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
389-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
390-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
391-
key-threshold: 3
392-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
393-
EOF
394-
fi
395383
cat >> $CABAL_CONFIG <<EOF
396384
program-default-options
397385
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -460,9 +448,6 @@ jobs:
460448
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
461449
cat >> cabal.project <<EOF
462450
EOF
463-
if $HEADHACKAGE; then
464-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
465-
fi
466451
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
467452
cat cabal.project
468453
cat cabal.project.local

‎fixtures/doctest-version.travis‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ before_install:
212212
- TEST=--enable-tests
213213
- BENCH=--enable-benchmarks
214214
- HEADHACKAGE=false
215-
- if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then HEADHACKAGE=true ; fi
216215
- rm -f $CABALHOME/config
217216
- |
218217
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
@@ -230,17 +229,6 @@ before_install:
230229
echo " prefix: $CABALHOME" >> $CABALHOME/config
231230
echo "repository hackage.haskell.org" >> $CABALHOME/config
232231
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
233-
- |
234-
if $HEADHACKAGE; then
235-
echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config
236-
echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config
237-
echo " secure: True" >> $CABALHOME/config
238-
echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config
239-
echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config
240-
echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
241-
echo " key-threshold: 3" >> $CABALHOME/config
242-
echo "active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override" >> $CABALHOME/config
243-
fi
244232
install:
245233
- ${CABAL} --version
246234
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
@@ -261,10 +249,6 @@ install:
261249
- if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
262250
- "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
263251
- ""
264-
- |
265-
if $HEADHACKAGE; then
266-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
267-
fi
268252
- "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"
269253
- cat cabal.project || true
270254
- cat cabal.project.local || true
@@ -292,10 +276,6 @@ script:
292276
- if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
293277
- "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
294278
- ""
295-
- |
296-
if $HEADHACKAGE; then
297-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
298-
fi
299279
- "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"
300280
- cat cabal.project || true
301281
- cat cabal.project.local || true

‎fixtures/doctest.github‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ jobs:
352352
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
353353
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
354354
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
355-
if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
355+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
356356
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
357357
env:
358358
HCKIND: ${{ matrix.compilerKind }}
@@ -380,18 +380,6 @@ jobs:
380380
repository hackage.haskell.org
381381
url: http://hackage.haskell.org/
382382
EOF
383-
if $HEADHACKAGE; then
384-
cat >> $CABAL_CONFIG <<EOF
385-
repository head.hackage.ghc.haskell.org
386-
url: https://ghc.gitlab.haskell.org/head.hackage/
387-
secure: True
388-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
389-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
390-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
391-
key-threshold: 3
392-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
393-
EOF
394-
fi
395383
cat >> $CABAL_CONFIG <<EOF
396384
program-default-options
397385
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -460,9 +448,6 @@ jobs:
460448
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
461449
cat >> cabal.project <<EOF
462450
EOF
463-
if $HEADHACKAGE; then
464-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
465-
fi
466451
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
467452
cat cabal.project
468453
cat cabal.project.local

‎fixtures/doctest.travis‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ before_install:
212212
- TEST=--enable-tests
213213
- BENCH=--enable-benchmarks
214214
- HEADHACKAGE=false
215-
- if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then HEADHACKAGE=true ; fi
216215
- rm -f $CABALHOME/config
217216
- |
218217
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
@@ -230,17 +229,6 @@ before_install:
230229
echo " prefix: $CABALHOME" >> $CABALHOME/config
231230
echo "repository hackage.haskell.org" >> $CABALHOME/config
232231
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
233-
- |
234-
if $HEADHACKAGE; then
235-
echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config
236-
echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config
237-
echo " secure: True" >> $CABALHOME/config
238-
echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config
239-
echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config
240-
echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
241-
echo " key-threshold: 3" >> $CABALHOME/config
242-
echo "active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override" >> $CABALHOME/config
243-
fi
244232
install:
245233
- ${CABAL} --version
246234
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
@@ -261,10 +249,6 @@ install:
261249
- if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
262250
- "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
263251
- ""
264-
- |
265-
if $HEADHACKAGE; then
266-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
267-
fi
268252
- "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"
269253
- cat cabal.project || true
270254
- cat cabal.project.local || true
@@ -292,10 +276,6 @@ script:
292276
- if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
293277
- "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
294278
- ""
295-
- |
296-
if $HEADHACKAGE; then
297-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
298-
fi
299279
- "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"
300280
- cat cabal.project || true
301281
- cat cabal.project.local || true

‎fixtures/enabled-jobs.github‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ jobs:
352352
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
353353
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
354354
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
355-
if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
355+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
356356
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
357357
env:
358358
HCKIND: ${{ matrix.compilerKind }}
@@ -380,18 +380,6 @@ jobs:
380380
repository hackage.haskell.org
381381
url: http://hackage.haskell.org/
382382
EOF
383-
if $HEADHACKAGE; then
384-
cat >> $CABAL_CONFIG <<EOF
385-
repository head.hackage.ghc.haskell.org
386-
url: https://ghc.gitlab.haskell.org/head.hackage/
387-
secure: True
388-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
389-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
390-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
391-
key-threshold: 3
392-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
393-
EOF
394-
fi
395383
cat >> $CABAL_CONFIG <<EOF
396384
program-default-options
397385
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -445,9 +433,6 @@ jobs:
445433
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
446434
cat >> cabal.project <<EOF
447435
EOF
448-
if $HEADHACKAGE; then
449-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
450-
fi
451436
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
452437
cat cabal.project
453438
cat cabal.project.local

0 commit comments

Comments
 (0)