From 7bbca3c5c396a34aef3f91909bd5712c21a9ec14 Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Tue, 14 May 2024 11:37:31 +0000 Subject: [PATCH 1/4] Bump upper dependency bound on `base`. --- deepseq.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deepseq.cabal b/deepseq.cabal index ae37270..5dd3c65 100644 --- a/deepseq.cabal +++ b/deepseq.cabal @@ -58,7 +58,7 @@ library if impl(ghc >=9.0) build-depends: ghc-prim - build-depends: base >= 4.12 && < 4.20, + build-depends: base >= 4.12 && < 4.21, array >= 0.4 && < 0.6 ghc-options: -Wall From 10b440a156e8fc42636a0077f8a4515e505521fb Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Tue, 14 May 2024 12:01:10 +0000 Subject: [PATCH 2/4] Regenerate `haskell-ci.yml`. With: ``` haskell-ci regenerate ``` --- .github/workflows/haskell-ci.yml | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index e232f00..35df914 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.16.3 +# version: 0.18.1 # -# REGENDATA ("0.16.3",["github","deepseq.cabal"]) +# REGENDATA ("0.18.1",["github","deepseq.cabal"]) # name: Haskell-CI on: @@ -51,12 +51,12 @@ jobs: - compiler: ghc-8.8.4 compilerKind: ghc compilerVersion: 8.8.4 - setup-method: ghcup + setup-method: hvr-ppa allow-failure: false - compiler: ghc-8.6.5 compilerKind: ghc compilerVersion: 8.6.5 - setup-method: ghcup + setup-method: hvr-ppa allow-failure: false fail-fast: false steps: @@ -66,18 +66,18 @@ jobs: apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 if [ "${{ matrix.setup-method }}" = ghcup ]; then mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup" + 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.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.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.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup" + 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 cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) fi env: HCKIND: ${{ matrix.compilerKind }} @@ -91,17 +91,19 @@ jobs: echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" HCDIR=/opt/$HCKIND/$HCVER if [ "${{ matrix.setup-method }}" = ghcup ]; then - HC=$HOME/.ghcup/bin/$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=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV" - echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$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" 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" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" fi HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') @@ -184,8 +186,8 @@ jobs: touch cabal.project touch cabal.project.local echo "packages: ${PKGDIR_deepseq}" >> cabal.project - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package deepseq" >> cabal.project ; fi - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi + echo "package deepseq" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project cat >> cabal.project <> cabal.project.local From 848c9f3095a376c16d26c79db53ab96df4ebd105 Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Tue, 14 May 2024 12:29:10 +0000 Subject: [PATCH 3/4] Bump minor versions of already-supported GHC versions. --- .github/workflows/haskell-ci.yml | 8 ++++---- deepseq.cabal | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 35df914..fb90618 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -28,14 +28,14 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.4.3 + - compiler: ghc-9.4.8 compilerKind: ghc - compilerVersion: 9.4.3 + compilerVersion: 9.4.8 setup-method: ghcup allow-failure: false - - compiler: ghc-9.2.5 + - compiler: ghc-9.2.8 compilerKind: ghc - compilerVersion: 9.2.5 + compilerVersion: 9.2.8 setup-method: ghcup allow-failure: false - compiler: ghc-9.0.2 diff --git a/deepseq.cabal b/deepseq.cabal index 5dd3c65..8f9421a 100644 --- a/deepseq.cabal +++ b/deepseq.cabal @@ -26,8 +26,8 @@ description: build-type: Simple tested-with: - GHC==9.4.3, - GHC==9.2.5, + GHC==9.4.8, + GHC==9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, From f6759bcd1a0b5154d59a02020c25db26723ab766 Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Tue, 14 May 2024 12:34:04 +0000 Subject: [PATCH 4/4] Add support for recent GHC versions up to `9.10.1`. --- .github/workflows/haskell-ci.yml | 15 +++++++++++++++ deepseq.cabal | 3 +++ 2 files changed, 18 insertions(+) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index fb90618..4f447a3 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -28,6 +28,21 @@ jobs: 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.5 + compilerKind: ghc + compilerVersion: 9.6.5 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.4.8 compilerKind: ghc compilerVersion: 9.4.8 diff --git a/deepseq.cabal b/deepseq.cabal index 8f9421a..09039c7 100644 --- a/deepseq.cabal +++ b/deepseq.cabal @@ -26,6 +26,9 @@ description: build-type: Simple tested-with: + GHC==9.10.1, + GHC==9.8.2, + GHC==9.6.5, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2,