From 709613e47ef969883ad3dfec91d448df07d36051 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Tue, 18 Feb 2025 10:52:46 +0100 Subject: [PATCH] Bump CI to GHC 9.12.1 --- .github/workflows/haskell-ci.yml | 63 +++++++++++++------------------- source/BNFC.cabal | 4 +- source/stack-9.6.yaml | 4 +- source/stack-9.8.yaml | 4 +- stack-9.10.yaml | 12 +++--- stack-9.6.yaml | 2 +- stack-9.8.yaml | 4 +- testing/bnfc-system-tests.cabal | 4 +- 8 files changed, 43 insertions(+), 54 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 347be53e..fccfe1c5 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -6,11 +6,11 @@ # # haskell-ci regenerate # -# For more information, see https://github.com/andreasabel/haskell-ci +# For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20241021 +# version: 0.19.20250216 # -# REGENDATA ("0.19.20241021",["github","cabal.project"]) +# REGENDATA ("0.19.20250216",["github","cabal.project"]) # name: Haskell-CI on: @@ -23,7 +23,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: @@ -32,9 +32,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.20241014 + - compiler: ghc-9.12.1 compilerKind: ghc - compilerVersion: 9.12.20241014 + compilerVersion: 9.12.1 setup-method: ghcup allow-failure: false - compiler: ghc-9.10.1 @@ -42,9 +42,9 @@ jobs: compilerVersion: 9.10.1 setup-method: ghcup allow-failure: false - - compiler: ghc-9.8.2 + - compiler: ghc-9.8.4 compilerKind: ghc - compilerVersion: 9.8.2 + compilerVersion: 9.8.4 setup-method: ghcup allow-failure: false - compiler: ghc-9.6.6 @@ -99,16 +99,29 @@ jobs: allow-failure: false fail-fast: false steps: - - name: apt + - name: apt-get install run: | apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev + - name: Install GHCup + run: | mkdir -p "$HOME/.ghcup/bin" curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.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) + - name: Install cabal-install + run: | "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + - name: Install GHC (GHCup) + if: matrix.setup-method == 'ghcup' + run: | + "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) + 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" env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -119,21 +132,12 @@ jobs: echo "LANG=C.UTF-8" >> "$GITHUB_ENV" echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" - HCDIR=/opt/$HCKIND/$HCVER - 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.12.1.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" - if [ $((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" - echo "GHCJSARITH=0" >> "$GITHUB_ENV" env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -160,18 +164,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 /^(BNFC|bnfc-system-tests)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local @@ -280,8 +269,8 @@ jobs: rm -f cabal.project.local $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all - name: save cache - uses: actions/cache/save@v4 if: always() + uses: actions/cache/save@v4 with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} path: ~/.cabal/store diff --git a/source/BNFC.cabal b/source/BNFC.cabal index a354ee5a..1d14f327 100644 --- a/source/BNFC.cabal +++ b/source/BNFC.cabal @@ -32,9 +32,9 @@ Description: -- Support range when build with cabal tested-with: - GHC == 9.12.0 + GHC == 9.12.1 GHC == 9.10.1 - GHC == 9.8.2 + GHC == 9.8.4 GHC == 9.6.6 GHC == 9.4.8 GHC == 9.2.8 diff --git a/source/stack-9.6.yaml b/source/stack-9.6.yaml index 97984ed1..0a2d882d 100644 --- a/source/stack-9.6.yaml +++ b/source/stack-9.6.yaml @@ -1,3 +1,3 @@ -resolver: lts-22.23 -compiler: ghc-9.6.5 +resolver: lts-22.43 +compiler: ghc-9.6.6 compiler-check: newer-minor diff --git a/source/stack-9.8.yaml b/source/stack-9.8.yaml index 7deed167..d1917346 100644 --- a/source/stack-9.8.yaml +++ b/source/stack-9.8.yaml @@ -1,5 +1,5 @@ -resolver: nightly-2024-05-30 -compiler: ghc-9.8.2 +resolver: lts-23.9 +compiler: ghc-9.8.4 compiler-check: newer-minor packages: diff --git a/stack-9.10.yaml b/stack-9.10.yaml index fd2519f0..f2d9f5e8 100644 --- a/stack-9.10.yaml +++ b/stack-9.10.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2024-10-30 +resolver: nightly-2025-02-18 compiler: ghc-9.10.1 compiler-check: newer-minor @@ -6,8 +6,8 @@ packages: - source - testing -extra-deps: -- directory-1.3.8.3 #.5 -- filepath-1.4.300.2 # 1.5.3.0 -- process-1.6.19.0 #.23.0 -- unix-2.8.5.1 +# extra-deps: +# - directory-1.3.8.3 #.5 +# - filepath-1.4.300.2 # 1.5.3.0 +# - process-1.6.19.0 #.23.0 +# - unix-2.8.5.1 diff --git a/stack-9.6.yaml b/stack-9.6.yaml index b8505777..491d10f3 100644 --- a/stack-9.6.yaml +++ b/stack-9.6.yaml @@ -1,4 +1,4 @@ -resolver: lts-22.39 +resolver: lts-22.43 compiler: ghc-9.6.6 compiler-check: newer-minor diff --git a/stack-9.8.yaml b/stack-9.8.yaml index c83ceff5..2db33683 100644 --- a/stack-9.8.yaml +++ b/stack-9.8.yaml @@ -1,5 +1,5 @@ -resolver: nightly-2024-10-21 -compiler: ghc-9.8.2 +resolver: lts-23.9 +compiler: ghc-9.8.4 compiler-check: newer-minor packages: diff --git a/testing/bnfc-system-tests.cabal b/testing/bnfc-system-tests.cabal index 6fb56987..41458247 100644 --- a/testing/bnfc-system-tests.cabal +++ b/testing/bnfc-system-tests.cabal @@ -50,9 +50,9 @@ build-type: Simple cabal-version: >=1.10 tested-with: - GHC == 9.12.0 + GHC == 9.12.1 GHC == 9.10.1 - GHC == 9.8.2 + GHC == 9.8.4 GHC == 9.6.6 GHC == 9.4.8 GHC == 9.2.8