From f00e9c1ecfba17f62290b4591ec3ce1979eeeb94 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 22 Dec 2024 19:47:21 +0200 Subject: [PATCH] head.hackage >= 9.13 --- fixtures/all-versions.github | 17 +---------------- fixtures/doctest-version.github | 17 +---------------- fixtures/doctest.github | 17 +---------------- fixtures/enabled-jobs.github | 17 +---------------- haskell-ci.cabal | 2 +- src/HaskellCI/Config/History.hs | 6 ++++-- 6 files changed, 9 insertions(+), 67 deletions(-) diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github index be3ff603..4e62998c 100644 --- 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 >= 91200)) -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 <> $CABAL_CONFIG <= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi cat >> cabal.project <> cabal.project - fi $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local diff --git a/fixtures/doctest-version.github b/fixtures/doctest-version.github index db27975e..5ca59d13 100644 --- 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 >= 91200)) -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 <> $CABAL_CONFIG <= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi cat >> cabal.project <> cabal.project - fi $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local diff --git a/fixtures/doctest.github b/fixtures/doctest.github index 61a7e4a3..ec3bdb29 100644 --- 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 >= 91200)) -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 <> $CABAL_CONFIG <= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi cat >> cabal.project <> cabal.project - fi $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local diff --git a/fixtures/enabled-jobs.github b/fixtures/enabled-jobs.github index 81976c2e..10d95f01 100644 --- 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 >= 91200)) -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 <> $CABAL_CONFIG <= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi cat >> cabal.project <> cabal.project - fi $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local diff --git a/haskell-ci.cabal b/haskell-ci.cabal index 4c3903ca..0e3dbb31 100644 --- a/haskell-ci.cabal +++ b/haskell-ci.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: haskell-ci -version: 0.19.20241219 +version: 0.19.20241222 synopsis: Haskell CI script generator description: Script generator (@haskell-ci@) for diff --git a/src/HaskellCI/Config/History.hs b/src/HaskellCI/Config/History.hs index f2cdb656..34409ef7 100644 --- a/src/HaskellCI/Config/History.hs +++ b/src/HaskellCI/Config/History.hs @@ -25,7 +25,7 @@ configHistory = , ver 0 19 20240420 := \cfg -> cfg & field @"cfgUbuntu" .~ Jammy , ver 0 19 20240513 := \cfg -> cfg - -- defaultHeadHackage = C.orLaterVersion (C.mkVersion [9,11]) + -- & defaultHeadHackage .~ C.orLaterVersion (C.mkVersion [9,11]) , ver 0 19 20240702 := \cfg -> cfg & field @"cfgCabalInstallVersion" ?~ C.mkVersion [3,12,1,0] & 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,7 +54,7 @@ configHistory = & field @"cfgVersionMapping" .~ Map.singleton (mkVersion [9,12,1]) (mkVersion [9,12,0,20241128]) , ver 0 19 20241218 := \cfg -> cfg & field @"cfgCabalInstallVersion" ?~ C.mkVersion [3,15,0,0,2024,10,3] - , ver 0 19 20241202 := \cfg -> cfg + , ver 0 19 20241219 := \cfg -> cfg & field @"cfgVersionMapping" .~ mempty & field @"cfgSetupMethods" .~ PerSetupMethod { hvrPpa = C.noVersion @@ -62,6 +62,8 @@ configHistory = , ghcupVanilla = C.withinVersion (C.mkVersion [9,8,3]) , ghcupPrerelease = C.noVersion } + , ver 0 19 20240522 := \cfg -> cfg + & field @"cfgHeadHackage" .~ C.orLaterVersion (C.mkVersion [9,13]) ] where ver x y z = [x, y, z]