Skip to content

Commit f00e9c1

Browse files
phadejphadej
committed
head.hackage >= 9.13
1 parent 4765b1c commit f00e9c1

File tree

6 files changed

+9
-67
lines changed

6 files changed

+9
-67
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 >= 91200)) -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
@@ -443,9 +431,6 @@ jobs:
443431
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
444432
cat >> cabal.project <<EOF
445433
EOF
446-
if $HEADHACKAGE; then
447-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
448-
fi
449434
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
450435
cat cabal.project
451436
cat cabal.project.local

‎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 >= 91200)) -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
@@ -458,9 +446,6 @@ jobs:
458446
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
459447
cat >> cabal.project <<EOF
460448
EOF
461-
if $HEADHACKAGE; then
462-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
463-
fi
464449
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
465450
cat cabal.project
466451
cat cabal.project.local

‎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 >= 91200)) -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
@@ -458,9 +446,6 @@ jobs:
458446
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
459447
cat >> cabal.project <<EOF
460448
EOF
461-
if $HEADHACKAGE; then
462-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
463-
fi
464449
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
465450
cat cabal.project
466451
cat cabal.project.local

‎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 >= 91200)) -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
@@ -443,9 +431,6 @@ jobs:
443431
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
444432
cat >> cabal.project <<EOF
445433
EOF
446-
if $HEADHACKAGE; then
447-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
448-
fi
449434
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
450435
cat cabal.project
451436
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.20241219
3+
version: 0.19.20241222
44
synopsis: Haskell CI script generator
55
description:
66
Script generator (@haskell-ci@) for

‎src/HaskellCI/Config/History.hs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ configHistory =
2525
, ver 0 19 20240420 := \cfg -> cfg
2626
& field @"cfgUbuntu" .~ Jammy
2727
, ver 0 19 20240513 := \cfg -> cfg
28-
-- defaultHeadHackage = C.orLaterVersion (C.mkVersion [9,11])
28+
-- & defaultHeadHackage .~ C.orLaterVersion (C.mkVersion [9,11])
2929
, ver 0 19 20240702 := \cfg -> cfg
3030
& field @"cfgCabalInstallVersion" ?~ C.mkVersion [3,12,1,0]
3131
& field @"cfgDocspec" . field @"cfgDocspecUrl" .~ "https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240703/cabal-docspec-0.0.0.20240703-x86_64-linux.xz"
@@ -54,14 +54,16 @@ configHistory =
5454
& field @"cfgVersionMapping" .~ Map.singleton (mkVersion [9,12,1]) (mkVersion [9,12,0,20241128])
5555
, ver 0 19 20241218 := \cfg -> cfg
5656
& field @"cfgCabalInstallVersion" ?~ C.mkVersion [3,15,0,0,2024,10,3]
57-
, ver 0 19 20241202 := \cfg -> cfg
57+
, ver 0 19 20241219 := \cfg -> cfg
5858
& field @"cfgVersionMapping" .~ mempty
5959
& field @"cfgSetupMethods" .~ PerSetupMethod
6060
{ hvrPpa = C.noVersion
6161
, ghcup = invertVersionRange (C.withinVersion (C.mkVersion [9,8,3]))
6262
, ghcupVanilla = C.withinVersion (C.mkVersion [9,8,3])
6363
, ghcupPrerelease = C.noVersion
6464
}
65+
, ver 0 19 20240522 := \cfg -> cfg
66+
& field @"cfgHeadHackage" .~ C.orLaterVersion (C.mkVersion [9,13])
6567
]
6668
where
6769
ver x y z = [x, y, z]

0 commit comments

Comments
 (0)