From 7e655b3f0b9f4473082a9f0b538afebb9ce4887d Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sun, 14 Jul 2024 22:55:56 +0200 Subject: [PATCH 1/2] Bump Haskell CI to GHC 9.10.1 --- .github/workflows/haskell-ci.yml | 21 +++++++++++++-------- alex.cabal | 7 +++++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 82e19ee..b71f3ff 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.18.0.20240225 +# version: 0.19.20240703 # -# REGENDATA ("0.18.0.20240225",["github","alex.cabal"]) +# REGENDATA ("0.19.20240703",["github","alex.cabal"]) # name: Haskell-CI on: @@ -27,19 +27,24 @@ 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.10.1 + compilerKind: ghc + compilerVersion: 9.10.1 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.8.2 compilerKind: ghc compilerVersion: 9.8.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.4 + - compiler: ghc-9.6.6 compilerKind: ghc - compilerVersion: 9.6.4 + compilerVersion: 9.6.6 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.8 @@ -97,7 +102,7 @@ jobs: 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" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.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 }} @@ -115,7 +120,7 @@ jobs: echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.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" @@ -213,7 +218,7 @@ jobs: if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(alex)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan diff --git a/alex.cabal b/alex.cabal index e5b2434..0817545 100644 --- a/alex.cabal +++ b/alex.cabal @@ -22,8 +22,9 @@ category: Development build-type: Simple tested-with: + GHC == 9.10.1 GHC == 9.8.2 - GHC == 9.6.4 + GHC == 9.6.6 GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2 @@ -149,4 +150,6 @@ test-suite tests default-language: Haskell2010 - build-depends: base, process + build-depends: + base < 5 + , process From fffec3ec5014aa03829ee9a68379c15aa08146c0 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sun, 14 Jul 2024 23:00:53 +0200 Subject: [PATCH 2/2] Bump simple CI to GHC 9.10.1 --- .github/workflows/haskell-ci-simple.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/haskell-ci-simple.yml b/.github/workflows/haskell-ci-simple.yml index eafbda4..8b8a811 100644 --- a/.github/workflows/haskell-ci-simple.yml +++ b/.github/workflows/haskell-ci-simple.yml @@ -29,13 +29,14 @@ jobs: # - "8.10.7" # - "9.0.2" # - "9.2.8" - - "9.4.8" - - "9.6.4" - - "9.8.1" + # - "9.4.8" + - "9.6.6" + - "9.8.2" + - "9.10.1" include: - - ghc: "9.8.1" + - ghc: "9.10.1" os: macos-latest - - ghc: "9.8.1" + - ghc: "9.10.1" os: windows-latest steps: