Merge pull request #726 from haskell-CI/bump-head-hackage

head.hackage >=9.11
haskell-CI · May 12, 2024 · b5e981b · b5e981b
2 parents 07deeb7 + 41bb431
commit b5e981b
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 146 deletions.
diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github
@@ -352,7 +352,7 @@ jobs:
  echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
  echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
  echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
- if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
+ echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
  echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
  env:
  HCKIND: ${{ matrix.compilerKind }}
@@ -380,18 +380,6 @@ jobs:
  repository hackage.haskell.org
  url: http://hackage.haskell.org/
  EOF
- if $HEADHACKAGE; then
- cat >> $CABAL_CONFIG <<EOF
- repository head.hackage.ghc.haskell.org
- url: https://ghc.gitlab.haskell.org/head.hackage/
- secure: True
- root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
- 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
- f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
- key-threshold: 3
- active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
- EOF
- fi
  cat >> $CABAL_CONFIG <<EOF
  program-default-options
  ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -445,9 +433,6 @@ jobs:
  if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
  cat >> cabal.project <<EOF
  EOF
- if $HEADHACKAGE; then
- echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
- fi
  $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
  cat cabal.project
  cat cabal.project.local

diff --git a/fixtures/all-versions.travis b/fixtures/all-versions.travis
@@ -212,7 +212,6 @@ before_install:
  - TEST=--enable-tests
  - BENCH=--enable-benchmarks
  - HEADHACKAGE=false
- - if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then HEADHACKAGE=true ; fi
  - rm -f $CABALHOME/config
  - |
  echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
@@ -230,17 +229,6 @@ before_install:
  echo " prefix: $CABALHOME" >> $CABALHOME/config
  echo "repository hackage.haskell.org" >> $CABALHOME/config
  echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
- - |
- if $HEADHACKAGE; then
- echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config
- echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config
- echo " secure: True" >> $CABALHOME/config
- echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config
- echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config
- echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
- echo " key-threshold: 3" >> $CABALHOME/config
- echo "active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override" >> $CABALHOME/config
- fi
 install:
  - ${CABAL} --version
  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
@@ -260,10 +248,6 @@ install:
  - if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
  - "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
  - ""
- - |
- if $HEADHACKAGE; then
- echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
- fi
  - "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"
  - cat cabal.project || true
  - cat cabal.project.local || true
@@ -291,10 +275,6 @@ script:
  - if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
  - "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
  - ""
- - |
- if $HEADHACKAGE; then
- echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
- fi
  - "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"
  - cat cabal.project || true
  - cat cabal.project.local || true

diff --git a/fixtures/doctest-version.github b/fixtures/doctest-version.github
@@ -352,7 +352,7 @@ jobs:
  echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
  echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
  echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
- if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
+ echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
  echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
  env:
  HCKIND: ${{ matrix.compilerKind }}
@@ -380,18 +380,6 @@ jobs:
  repository hackage.haskell.org
  url: http://hackage.haskell.org/
  EOF
- if $HEADHACKAGE; then
- cat >> $CABAL_CONFIG <<EOF
- repository head.hackage.ghc.haskell.org
- url: https://ghc.gitlab.haskell.org/head.hackage/
- secure: True
- root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
- 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
- f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
- key-threshold: 3
- active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
- EOF
- fi
  cat >> $CABAL_CONFIG <<EOF
  program-default-options
  ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -460,9 +448,6 @@ jobs:
  if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
  cat >> cabal.project <<EOF
  EOF
- if $HEADHACKAGE; then
- echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
- fi
  $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
  cat cabal.project
  cat cabal.project.local

diff --git a/fixtures/doctest-version.travis b/fixtures/doctest-version.travis
@@ -212,7 +212,6 @@ before_install:
  - TEST=--enable-tests
  - BENCH=--enable-benchmarks
  - HEADHACKAGE=false
- - if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then HEADHACKAGE=true ; fi
  - rm -f $CABALHOME/config
  - |
  echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
@@ -230,17 +229,6 @@ before_install:
  echo " prefix: $CABALHOME" >> $CABALHOME/config
  echo "repository hackage.haskell.org" >> $CABALHOME/config
  echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
- - |
- if $HEADHACKAGE; then
- echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config
- echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config
- echo " secure: True" >> $CABALHOME/config
- echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config
- echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config
- echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
- echo " key-threshold: 3" >> $CABALHOME/config
- echo "active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override" >> $CABALHOME/config
- fi
 install:
  - ${CABAL} --version
  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
@@ -261,10 +249,6 @@ install:
  - if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
  - "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
  - ""
- - |
- if $HEADHACKAGE; then
- echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
- fi
  - "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"
  - cat cabal.project || true
  - cat cabal.project.local || true
@@ -292,10 +276,6 @@ script:
  - if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
  - "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
  - ""
- - |
- if $HEADHACKAGE; then
- echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
- fi
  - "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"
  - cat cabal.project || true
  - cat cabal.project.local || true

diff --git a/fixtures/doctest.github b/fixtures/doctest.github
@@ -352,7 +352,7 @@ jobs:
  echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
  echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
  echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
- if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
+ echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
  echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
  env:
  HCKIND: ${{ matrix.compilerKind }}
@@ -380,18 +380,6 @@ jobs:
  repository hackage.haskell.org
  url: http://hackage.haskell.org/
  EOF
- if $HEADHACKAGE; then
- cat >> $CABAL_CONFIG <<EOF
- repository head.hackage.ghc.haskell.org
- url: https://ghc.gitlab.haskell.org/head.hackage/
- secure: True
- root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
- 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
- f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
- key-threshold: 3
- active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
- EOF
- fi
  cat >> $CABAL_CONFIG <<EOF
  program-default-options
  ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -460,9 +448,6 @@ jobs:
  if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
  cat >> cabal.project <<EOF
  EOF
- if $HEADHACKAGE; then
- echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
- fi
  $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
  cat cabal.project
  cat cabal.project.local

diff --git a/fixtures/doctest.travis b/fixtures/doctest.travis
@@ -212,7 +212,6 @@ before_install:
  - TEST=--enable-tests
  - BENCH=--enable-benchmarks
  - HEADHACKAGE=false
- - if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then HEADHACKAGE=true ; fi
  - rm -f $CABALHOME/config
  - |
  echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
@@ -230,17 +229,6 @@ before_install:
  echo " prefix: $CABALHOME" >> $CABALHOME/config
  echo "repository hackage.haskell.org" >> $CABALHOME/config
  echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
- - |
- if $HEADHACKAGE; then
- echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config
- echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config
- echo " secure: True" >> $CABALHOME/config
- echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config
- echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config
- echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
- echo " key-threshold: 3" >> $CABALHOME/config
- echo "active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override" >> $CABALHOME/config
- fi
 install:
  - ${CABAL} --version
  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
@@ -261,10 +249,6 @@ install:
  - if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
  - "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
  - ""
- - |
- if $HEADHACKAGE; then
- echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
- fi
  - "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"
  - cat cabal.project || true
  - cat cabal.project.local || true
@@ -292,10 +276,6 @@ script:
  - if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo 'package splitmix' >> cabal.project ; fi
  - "if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
  - ""
- - |
- if $HEADHACKAGE; then
- echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> $CABALHOME/config
- fi
  - "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"
  - cat cabal.project || true
  - cat cabal.project.local || true

diff --git a/fixtures/enabled-jobs.github b/fixtures/enabled-jobs.github
@@ -352,7 +352,7 @@ jobs:
  echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
  echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
  echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
- if [ $((! GHCJSARITH && HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
+ echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
  echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
  env:
  HCKIND: ${{ matrix.compilerKind }}
@@ -380,18 +380,6 @@ jobs:
  repository hackage.haskell.org
  url: http://hackage.haskell.org/
  EOF
- if $HEADHACKAGE; then
- cat >> $CABAL_CONFIG <<EOF
- repository head.hackage.ghc.haskell.org
- url: https://ghc.gitlab.haskell.org/head.hackage/
- secure: True
- root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
- 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
- f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
- key-threshold: 3
- active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
- EOF
- fi
  cat >> $CABAL_CONFIG <<EOF
  program-default-options
  ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -445,9 +433,6 @@ jobs:
  if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
  cat >> cabal.project <<EOF
  EOF
- if $HEADHACKAGE; then
- echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
- fi
  $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
  cat cabal.project
  cat cabal.project.local