From a4b6e0a8420df52725fc30565acfe62c0b6281a6 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Tue, 23 Apr 2024 14:22:28 +0200 Subject: [PATCH] Bump CI to GHC 9.10.0 and latest minor versions Bump HTF to a version without custom setup to work around https://github.com/haskell/cabal/issues/9917 --- .github/workflows/haskell-ci.yml | 89 +++++++++++++++----------------- source/BNFC.cabal | 7 +-- source/Makefile | 4 +- source/stack-9.6.yaml | 4 +- source/stack-9.8.yaml | 4 +- stack-9.6.yaml | 4 +- stack-9.8.yaml | 10 ++-- testing/bnfc-system-tests.cabal | 11 ++-- 8 files changed, 64 insertions(+), 69 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 90975598..ba0ea874 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/andreasabel/haskell-ci # -# version: 0.17.20231012 +# version: 0.19.20240422 # -# REGENDATA ("0.17.20231012",["github","cabal.project"]) +# REGENDATA ("0.19.20240422",["github","cabal.project"]) # name: Haskell-CI on: @@ -29,24 +29,29 @@ jobs: timeout-minutes: 60 container: - image: buildpack-deps:focal + image: buildpack-deps:jammy continue-on-error: ${{ matrix.allow-failure }} strategy: matrix: include: - - compiler: ghc-9.8.1 + - compiler: ghc-9.10.0.20240413 compilerKind: ghc - compilerVersion: 9.8.1 + compilerVersion: 9.10.0.20240413 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.3 + - compiler: ghc-9.8.2 compilerKind: ghc - compilerVersion: 9.6.3 + compilerVersion: 9.8.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.7 + - compiler: ghc-9.6.5 compilerKind: ghc - compilerVersion: 9.4.7 + compilerVersion: 9.6.5 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.4.8 + compilerKind: ghc + compilerVersion: 9.4.8 setup-method: ghcup allow-failure: false - compiler: ghc-9.2.8 @@ -89,34 +94,18 @@ jobs: compilerVersion: 8.0.2 setup-method: ghcup allow-failure: false - - compiler: ghc-7.10.3 - compilerKind: ghc - compilerVersion: 7.10.3 - setup-method: hvr-ppa - allow-failure: false fail-fast: false steps: - name: apt run: | apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev - if [ "${{ matrix.setup-method }}" = ghcup ]; then - mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup" - chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml; - "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - else - apt-add-repository -y 'ppa:hvr/ghc' - apt-get update - apt-get install -y "$HCNAME" - mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup" - chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml; - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - fi + mkdir -p "$HOME/.ghcup/bin" + curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" + chmod a+x "$HOME/.ghcup/bin/ghcup" + "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml; + "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.10.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -128,27 +117,18 @@ jobs: echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" HCDIR=/opt/$HCKIND/$HCVER - if [ "${{ matrix.setup-method }}" = ghcup ]; then - HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") - HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') - HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') - echo "HC=$HC" >> "$GITHUB_ENV" - echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" - echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" - else - HC=$HCDIR/bin/$HCKIND - echo "HC=$HC" >> "$GITHUB_ENV" - echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV" - echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" - fi - + HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") + HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') + HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') + echo "HC=$HC" >> "$GITHUB_ENV" + echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" + echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.3.0 -vnormal+nowrap" >> "$GITHUB_ENV" HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" - echo "HEADHACKAGE=false" >> "$GITHUB_ENV" + if [ $((HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" echo "GHCJSARITH=0" >> "$GITHUB_ENV" env: @@ -177,8 +157,18 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF + if $HEADHACKAGE; then cat >> $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: $_ installed\n" unless /^(BNFC|bnfc-system-tests)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local diff --git a/source/BNFC.cabal b/source/BNFC.cabal index 0b1c8266..c5397e26 100644 --- a/source/BNFC.cabal +++ b/source/BNFC.cabal @@ -32,8 +32,9 @@ Description: -- Support range when build with cabal tested-with: - GHC == 9.8.1 - GHC == 9.6.3 + GHC == 9.10.0 + GHC == 9.8.2 + GHC == 9.6.5 GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2 @@ -43,7 +44,7 @@ tested-with: GHC == 8.4.4 GHC == 8.2.2 GHC == 8.0.2 - GHC == 7.10.3 + -- GHC == 7.10.3 extra-doc-files: README.md diff --git a/source/Makefile b/source/Makefile index 6849b7b1..4c3ae3bb 100644 --- a/source/Makefile +++ b/source/Makefile @@ -8,7 +8,7 @@ CABAL_BUILDDIR_SUFFIX= CABAL_BUILD_OPTS = --enable-tests # --builddir=dist-ghc-$(GHC_VERSION)$(CABAL_BUILDDIR_SUFFIX) CABAL_CONFIGURE_OPTS = --enable-tests -CABAL_INSTALL_OPTS = $(CABAL_CONFIGURE_OPTS) $(CABAL_BUILD_OPTS) --overwrite-policy=always +CABAL_INSTALL_OPTS = --overwrite-policy=always CABAL_TEST_OPTS = $(CABAL_BUILD_OPTS) CABAL = cabal $(CABAL_OPTS) @@ -38,7 +38,7 @@ cabal-test: doctest: build doctest-install doctest-quick doctest-install: - cabal install doctest --program-suffix=-${GHC_VERSION} + cabal install doctest --ignore-project --program-suffix=-${GHC_VERSION} doctest-quick: cabal repl -w doctest-${GHC_VERSION} --repl-options=-Wno-type-defaults diff --git a/source/stack-9.6.yaml b/source/stack-9.6.yaml index 54648e91..ab2e280e 100644 --- a/source/stack-9.6.yaml +++ b/source/stack-9.6.yaml @@ -1,3 +1,3 @@ -resolver: lts-22.0 -compiler: ghc-9.6.3 +resolver: lts-22.18 +compiler: ghc-9.6.4 compiler-check: newer-minor diff --git a/source/stack-9.8.yaml b/source/stack-9.8.yaml index 4d024947..e77beb4a 100644 --- a/source/stack-9.8.yaml +++ b/source/stack-9.8.yaml @@ -1,5 +1,5 @@ -resolver: nightly-2023-12-19 -compiler: ghc-9.8.1 +resolver: nightly-2024-04-22 +compiler: ghc-9.8.2 compiler-check: newer-minor packages: diff --git a/stack-9.6.yaml b/stack-9.6.yaml index d7f14d91..869935f5 100644 --- a/stack-9.6.yaml +++ b/stack-9.6.yaml @@ -1,5 +1,5 @@ -resolver: lts-22.0 -compiler: ghc-9.6.3 +resolver: lts-22.18 +compiler: ghc-9.6.4 compiler-check: newer-minor packages: diff --git a/stack-9.8.yaml b/stack-9.8.yaml index 205c3841..37e107ee 100644 --- a/stack-9.8.yaml +++ b/stack-9.8.yaml @@ -1,11 +1,11 @@ -resolver: nightly-2023-12-19 -compiler: ghc-9.8.1 +resolver: nightly-2024-04-22 +compiler: ghc-9.8.2 compiler-check: newer-minor packages: - source - testing -extra-deps: -- aeson-2.2.1.0 -- th-abstraction-0.6.0.0 +# extra-deps: +# - aeson-2.2.1.0 +# - th-abstraction-0.6.0.0 diff --git a/testing/bnfc-system-tests.cabal b/testing/bnfc-system-tests.cabal index 81bcc52d..7353963b 100644 --- a/testing/bnfc-system-tests.cabal +++ b/testing/bnfc-system-tests.cabal @@ -50,9 +50,10 @@ build-type: Simple cabal-version: >=1.10 tested-with: - GHC == 9.8.1 - GHC == 9.6.3 - GHC == 9.4.7 + GHC == 9.10.0 + GHC == 9.8.2 + GHC == 9.6.5 + GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2 GHC == 8.10.7 @@ -90,8 +91,8 @@ executable bnfc-system-tests , filepath -- filepath >= 1.4.2.1 , text - , HTF >= 0.14.0.5 - -- API change in HTF-0.15.0.0 (issue #416) + , HTF >= 0.15.0.1 + -- HTF-0.15.0.1 drops custom Setup, easier to install , random , string-qq