Skip to content

Commit a3c487d

Browse files
phadejphadej
authored
Merge pull request #809 from haskell-CI/head-hackage-bump
Use head.hackage with GHC >=9.15
2 parents 3bdbba1 + e6113e4 commit a3c487d

6 files changed

Lines changed: 7 additions & 65 deletions

File tree

‎fixtures/all-versions.github‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ jobs:
377377
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
378378
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
379379
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
380-
if [ $((! GHCJSARITH && HCNUMVER >= 91400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
380+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
381381
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
382382
env:
383383
HCKIND: ${{ matrix.compilerKind }}
@@ -405,18 +405,6 @@ jobs:
405405
repository hackage.haskell.org
406406
url: http://hackage.haskell.org/
407407
EOF
408-
if $HEADHACKAGE; then
409-
cat >> $CABAL_CONFIG <<EOF
410-
repository head.hackage.ghc.haskell.org
411-
url: https://ghc.gitlab.haskell.org/head.hackage/
412-
secure: True
413-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
414-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
415-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
416-
key-threshold: 3
417-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
418-
EOF
419-
fi
420408
cat >> $CABAL_CONFIG <<EOF
421409
program-default-options
422410
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -472,9 +460,6 @@ jobs:
472460
if [ $((! GHCJSARITH && HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
473461
cat >> cabal.project <<EOF
474462
EOF
475-
if $HEADHACKAGE; then
476-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
477-
fi
478463
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
479464
cat cabal.project
480465
cat cabal.project.local

‎fixtures/doctest-version.github‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ jobs:
377377
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
378378
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
379379
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
380-
if [ $((! GHCJSARITH && HCNUMVER >= 91400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
380+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
381381
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
382382
env:
383383
HCKIND: ${{ matrix.compilerKind }}
@@ -405,18 +405,6 @@ jobs:
405405
repository hackage.haskell.org
406406
url: http://hackage.haskell.org/
407407
EOF
408-
if $HEADHACKAGE; then
409-
cat >> $CABAL_CONFIG <<EOF
410-
repository head.hackage.ghc.haskell.org
411-
url: https://ghc.gitlab.haskell.org/head.hackage/
412-
secure: True
413-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
414-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
415-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
416-
key-threshold: 3
417-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
418-
EOF
419-
fi
420408
cat >> $CABAL_CONFIG <<EOF
421409
program-default-options
422410
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -487,9 +475,6 @@ jobs:
487475
if [ $((! GHCJSARITH && HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
488476
cat >> cabal.project <<EOF
489477
EOF
490-
if $HEADHACKAGE; then
491-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
492-
fi
493478
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
494479
cat cabal.project
495480
cat cabal.project.local

‎fixtures/doctest.github‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ jobs:
377377
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
378378
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
379379
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
380-
if [ $((! GHCJSARITH && HCNUMVER >= 91400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
380+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
381381
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
382382
env:
383383
HCKIND: ${{ matrix.compilerKind }}
@@ -405,18 +405,6 @@ jobs:
405405
repository hackage.haskell.org
406406
url: http://hackage.haskell.org/
407407
EOF
408-
if $HEADHACKAGE; then
409-
cat >> $CABAL_CONFIG <<EOF
410-
repository head.hackage.ghc.haskell.org
411-
url: https://ghc.gitlab.haskell.org/head.hackage/
412-
secure: True
413-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
414-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
415-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
416-
key-threshold: 3
417-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
418-
EOF
419-
fi
420408
cat >> $CABAL_CONFIG <<EOF
421409
program-default-options
422410
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -487,9 +475,6 @@ jobs:
487475
if [ $((! GHCJSARITH && HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
488476
cat >> cabal.project <<EOF
489477
EOF
490-
if $HEADHACKAGE; then
491-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
492-
fi
493478
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
494479
cat cabal.project
495480
cat cabal.project.local

‎fixtures/enabled-jobs.github‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ jobs:
377377
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
378378
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
379379
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
380-
if [ $((! GHCJSARITH && HCNUMVER >= 91400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
380+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
381381
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
382382
env:
383383
HCKIND: ${{ matrix.compilerKind }}
@@ -405,18 +405,6 @@ jobs:
405405
repository hackage.haskell.org
406406
url: http://hackage.haskell.org/
407407
EOF
408-
if $HEADHACKAGE; then
409-
cat >> $CABAL_CONFIG <<EOF
410-
repository head.hackage.ghc.haskell.org
411-
url: https://ghc.gitlab.haskell.org/head.hackage/
412-
secure: True
413-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
414-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
415-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
416-
key-threshold: 3
417-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
418-
EOF
419-
fi
420408
cat >> $CABAL_CONFIG <<EOF
421409
program-default-options
422410
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -472,9 +460,6 @@ jobs:
472460
if [ $((! GHCJSARITH && HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
473461
cat >> cabal.project <<EOF
474462
EOF
475-
if $HEADHACKAGE; then
476-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
477-
fi
478463
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
479464
cat cabal.project
480465
cat cabal.project.local

‎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.19.20260102
3+
version: 0.19.20260104
44
synopsis: Haskell CI script generator
55
description:
66
Script generator (@haskell-ci@) for

‎src/HaskellCI/Config/History.hs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ configHistory =
115115
, ghcupVanilla = C.withinVersion (C.mkVersion [9,8,3])
116116
, ghcupPrerelease = C.noVersion
117117
}
118+
, ver 0 19 20250104 := \cfg -> cfg
119+
& field @"cfgHeadHackage" .~ C.orLaterVersion (C.mkVersion [9,15])
118120
]
119121
where
120122
ver x y z = [x, y, z]

0 commit comments

Comments
 (0)