From 46ac3efa70fb09e90f0ac008b72a92c8f808cd51 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Thu, 31 Oct 2024 10:34:15 +0100 Subject: [PATCH] Bump Haskell CI to GHC 9.12.0 (#36) --- .github/workflows/haskell-ci.yml | 37 +++++++++++++++++++++++++------- .github/workflows/stack.yml | 22 +++---------------- STMonadTrans.cabal | 3 ++- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 80fc97f..2175208 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.19.20240517 +# version: 0.19.20241021 # -# REGENDATA ("0.19.20240517",["github","STMonadTrans.cabal"]) +# REGENDATA ("0.19.20241021",["github","STMonadTrans.cabal"]) # name: Haskell-CI on: @@ -32,6 +32,11 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.12.20241014 + compilerKind: ghc + compilerVersion: 9.12.20241014 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.10.1 compilerKind: ghc compilerVersion: 9.10.1 @@ -42,9 +47,9 @@ jobs: compilerVersion: 9.8.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.5 + - compiler: ghc-9.6.6 compilerKind: ghc - compilerVersion: 9.6.5 + compilerVersion: 9.6.6 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.8 @@ -99,10 +104,11 @@ jobs: apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev 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" + 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) - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -120,12 +126,12 @@ jobs: 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" + 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" - echo "HEADHACKAGE=false" >> "$GITHUB_ENV" + if [ $((HCNUMVER >= 91200)) -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: @@ -154,6 +160,18 @@ 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 /^(STMonadTrans)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml index d8ccb10..4f805bd 100644 --- a/.github/workflows/stack.yml +++ b/.github/workflows/stack.yml @@ -22,10 +22,10 @@ jobs: include: - os: ubuntu-latest ghc: 9.8.2 - resolver: nightly-2024-06-22 + resolver: nightly-2024-10-21 - os: ubuntu-latest - ghc: 9.6.5 - resolver: lts-22.26 + ghc: 9.6.6 + resolver: lts-22.39 - os: ubuntu-latest ghc: 9.4.8 resolver: lts-21.25 @@ -47,22 +47,6 @@ jobs: - os: ubuntu-latest ghc: 8.4.4 resolver: lts-12.26 - - os: ubuntu-latest - ghc: 8.2.2 - resolver: lts-11.22 - - os: ubuntu-latest - ghc: 8.0.2 - resolver: lts-9.21 - - # Fails due to upstream issue https://github.com/commercialhaskell/stack/issues/6124 - # - os: ubuntu-20.04 - # ghc: 7.10.3 - # resolver: lts-6.35 - - # Can't install GHC 7.8.4 anymore on ubuntu runners - # - os: ubuntu-18.04 - # ghc: 7.8.4 - # resolver: lts-2.22 env: stack: 'stack --system-ghc --no-install-ghc' diff --git a/STMonadTrans.cabal b/STMonadTrans.cabal index 7673b21..eb7f9b2 100644 --- a/STMonadTrans.cabal +++ b/STMonadTrans.cabal @@ -22,9 +22,10 @@ description: Maybe and combinations of their corresponding monad transformers. Tested-With: + GHC == 9.12.0 GHC == 9.10.1 GHC == 9.8.2 - GHC == 9.6.5 + GHC == 9.6.6 GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2