From a8de7a1521d8c548e786aa6d578ad430bc8d580d Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Sun, 4 Jan 2026 13:51:24 +0000 Subject: [PATCH 1/2] GHC 9.14.1 support - Add to tested-with and regenerate with newer haskell-ci - Allow Cabal 3.16 --- .github/workflows/haskell-ci.yml | 50 +++++++++++++++----------------- entropy.cabal | 3 +- 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 1238a40..46ba502 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.20241219 +# version: 0.19.20260104 # -# REGENDATA ("0.19.20241219",["github","entropy.cabal"]) +# REGENDATA ("0.19.20260104",["github","entropy.cabal"]) # name: Haskell-CI on: @@ -20,10 +20,13 @@ on: pull_request: branches: - main + merge_group: + branches: + - main jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: @@ -32,6 +35,11 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.14.1 + compilerKind: ghc + compilerVersion: 9.14.1 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.12.1 compilerKind: ghc compilerVersion: 9.12.1 @@ -101,13 +109,12 @@ jobs: - 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" + curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - - name: Install cabal-install (prerelease) + - name: Install cabal-install run: | - "$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 cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV" + "$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: | @@ -132,7 +139,7 @@ jobs: 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" env: HCKIND: ${{ matrix.compilerKind }} @@ -160,18 +167,6 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF - if $HEADHACKAGE; then - cat >> $CABAL_CONFIG <> $CABAL_CONFIG <> cabal.project echo "package entropy" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package entropy" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package entropy" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> 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 /^(entropy)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local diff --git a/entropy.cabal b/entropy.cabal index 75ba5b5..fdaed6e 100644 --- a/entropy.cabal +++ b/entropy.cabal @@ -19,6 +19,7 @@ stability: stable build-type: Custom tested-with: + GHC == 9.14.1 GHC == 9.12.1 GHC == 9.10.1 GHC == 9.8.4 @@ -46,7 +47,7 @@ Flag DoNotGetEntropy Manual: True custom-setup - setup-depends: Cabal >= 1.10 && < 3.15 + setup-depends: Cabal >= 1.10 && < 3.17 , base < 5 , filepath < 1.6 , directory < 1.4 From 3a91200295cec6de6f7ece4b43a990a574f23856 Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Sat, 10 Jan 2026 22:16:39 +0000 Subject: [PATCH 2/2] Bump older GHC versions Per request from Andreas --- .github/workflows/haskell-ci.yml | 12 ++++++------ entropy.cabal | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 46ba502..dbf7210 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -40,14 +40,14 @@ jobs: compilerVersion: 9.14.1 setup-method: ghcup allow-failure: false - - compiler: ghc-9.12.1 + - compiler: ghc-9.12.2 compilerKind: ghc - compilerVersion: 9.12.1 + compilerVersion: 9.12.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.10.1 + - compiler: ghc-9.10.3 compilerKind: ghc - compilerVersion: 9.10.1 + compilerVersion: 9.10.3 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.4 @@ -55,9 +55,9 @@ jobs: compilerVersion: 9.8.4 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.6 + - compiler: ghc-9.6.7 compilerKind: ghc - compilerVersion: 9.6.6 + compilerVersion: 9.6.7 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.8 diff --git a/entropy.cabal b/entropy.cabal index fdaed6e..569b355 100644 --- a/entropy.cabal +++ b/entropy.cabal @@ -20,10 +20,10 @@ build-type: Custom tested-with: GHC == 9.14.1 - GHC == 9.12.1 - GHC == 9.10.1 + GHC == 9.12.2 + GHC == 9.10.3 GHC == 9.8.4 - GHC == 9.6.6 + GHC == 9.6.7 GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2