From dbe04ef3e9679808edfe6a02ac19315a305bcb50 Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Mon, 23 Dec 2024 16:00:14 +0000 Subject: [PATCH 1/3] Move to haskell-actions, and bump --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a3f934..d03ad1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: haskell/actions/setup@v2.3 + - uses: haskell-actions/setup@v2.7 id: setup-haskell-cabal name: Setup Haskell with: From 7f2d8fed8f0525e352889c282fe85f7771ad0857 Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Mon, 23 Dec 2024 15:58:33 +0000 Subject: [PATCH 2/3] Don't force a specific cabal (it won't work with GHC 9.12) --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d03ad1e..3c9697d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,6 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - cabal: ['3.10'] ghc: - '8.4.4' - '8.6.5' From f49a81a21a6a2820500a60961425207dc1b6e6cd Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Mon, 23 Dec 2024 15:56:29 +0000 Subject: [PATCH 3/3] Test GHC 9.12; support base < 4.22, ghc-prim < 0.14 --- .github/workflows/ci.yml | 1 + relude.cabal | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c9697d..9bff10c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,6 +28,7 @@ jobs: - '9.6.6' - '9.8.2' - '9.10.1' + - '9.12.1' exclude: - os: macOS-latest ghc: 9.8.2 diff --git a/relude.cabal b/relude.cabal index 478de13..1366b98 100644 --- a/relude.cabal +++ b/relude.cabal @@ -235,11 +235,11 @@ library , Data.ByteString.Short - build-depends: base >= 4.11 && < 4.21 + build-depends: base >= 4.11 && < 4.22 , bytestring >= 0.10 && < 0.13 , containers >= 0.5.10 && < 0.8 , deepseq >= 1.4 && < 1.6 - , ghc-prim >= 0.5.0.0 && < 0.12 + , ghc-prim >= 0.5.0.0 && < 0.14 , hashable >= 1.2 && < 1.6 , mtl >= 2.2 && < 2.4 , stm >= 2.4 && < 2.6