From cf789ce42d8755d55c874958012b7408cb0a030a Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Wed, 19 Apr 2023 07:40:12 -0400 Subject: [PATCH 1/2] Support building with mtl-2.3.* (GHC 9.6) `mtl-2.3.*` no longer re-exports `Control.Monad` from `Control.Monad.Reader`, which breaks some code in `dwarf`. This is easily fixed by tightening up the imports a bit. --- tests/Main.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Main.hs b/tests/Main.hs index 22a4a68..c658d59 100644 --- a/tests/Main.hs +++ b/tests/Main.hs @@ -2,8 +2,9 @@ module Main (main) where import Control.Exception ---import Control.Monad.IO -import Control.Monad.Reader +import Control.Monad (forM_, when) +import Control.Monad.IO.Class (MonadIO) +import Control.Monad.Reader (ReaderT(..)) import qualified Data.ByteString as BS import Data.Dwarf.Internals import Data.Typeable From f48704aebbe2e6911a7401699067872bf1621c15 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Thu, 29 Jun 2023 10:21:40 -0400 Subject: [PATCH 2/2] CI: Test GHC 9.2.8, 9.4.5, 9.6.2 --- .github/workflows/ci.yaml | 4 ++-- cabal.project.dist.freeze.ghc-8.10.7 | 13 ------------- cabal.project.dist.freeze.ghc-8.8.4 | 13 ------------- cabal.project.dist.freeze.ghc-9.0.2 | 13 ------------- ...-9.2.2 => cabal.project.dist.freeze.ghc-9.2.8 | 8 ++++---- cabal.project.dist.freeze.ghc-9.4.5 | 16 ++++++++++++++++ cabal.project.dist.freeze.ghc-9.6.2 | 16 ++++++++++++++++ 7 files changed, 38 insertions(+), 45 deletions(-) delete mode 100644 cabal.project.dist.freeze.ghc-8.10.7 delete mode 100644 cabal.project.dist.freeze.ghc-8.8.4 delete mode 100644 cabal.project.dist.freeze.ghc-9.0.2 rename cabal.project.dist.freeze.ghc-9.2.2 => cabal.project.dist.freeze.ghc-9.2.8 (72%) create mode 100644 cabal.project.dist.freeze.ghc-9.4.5 create mode 100644 cabal.project.dist.freeze.ghc-9.6.2 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 100937a..544c584 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,8 +7,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ghc-ver: ["8.8.4", "8.10.7", "9.0.2", "9.2.2"] - cabal: ["3.6.2.0"] + ghc-ver: ["9.2.8", "9.4.5", "9.6.2"] + cabal: ["3.10.1.0"] # complete all jobs fail-fast: false steps: diff --git a/cabal.project.dist.freeze.ghc-8.10.7 b/cabal.project.dist.freeze.ghc-8.10.7 deleted file mode 100644 index 3b2a021..0000000 --- a/cabal.project.dist.freeze.ghc-8.10.7 +++ /dev/null @@ -1,13 +0,0 @@ -active-repositories: hackage.haskell.org:merge -constraints: any.array ==0.5.4.0, - any.base ==4.14.3.0, - any.binary ==0.8.8.0, - any.bytestring ==0.10.12.0, - any.containers ==0.6.5.1, - any.deepseq ==1.4.4.0, - any.ghc-prim ==0.6.1, - any.integer-gmp ==1.0.3.0, - any.mtl ==2.2.2, - any.rts ==1.0.1, - any.transformers ==0.5.6.2 -index-state: hackage.haskell.org 2022-04-28T12:52:36Z diff --git a/cabal.project.dist.freeze.ghc-8.8.4 b/cabal.project.dist.freeze.ghc-8.8.4 deleted file mode 100644 index 4abd5e0..0000000 --- a/cabal.project.dist.freeze.ghc-8.8.4 +++ /dev/null @@ -1,13 +0,0 @@ -active-repositories: hackage.haskell.org:merge -constraints: any.array ==0.5.4.0, - any.base ==4.13.0.0, - any.binary ==0.8.7.0, - any.bytestring ==0.10.10.1, - any.containers ==0.6.2.1, - any.deepseq ==1.4.4.0, - any.ghc-prim ==0.5.3, - any.integer-gmp ==1.0.2.0, - any.mtl ==2.2.2, - any.rts ==1.0, - any.transformers ==0.5.6.2 -index-state: hackage.haskell.org 2022-04-28T12:52:36Z diff --git a/cabal.project.dist.freeze.ghc-9.0.2 b/cabal.project.dist.freeze.ghc-9.0.2 deleted file mode 100644 index 0033c65..0000000 --- a/cabal.project.dist.freeze.ghc-9.0.2 +++ /dev/null @@ -1,13 +0,0 @@ -active-repositories: hackage.haskell.org:merge -constraints: any.array ==0.5.4.0, - any.base ==4.15.1.0, - any.binary ==0.8.8.0, - any.bytestring ==0.10.12.1, - any.containers ==0.6.4.1, - any.deepseq ==1.4.5.0, - any.ghc-bignum ==1.1, - any.ghc-prim ==0.7.0, - any.mtl ==2.2.2, - any.rts ==1.0.2, - any.transformers ==0.5.6.2 -index-state: hackage.haskell.org 2022-04-28T12:52:36Z diff --git a/cabal.project.dist.freeze.ghc-9.2.2 b/cabal.project.dist.freeze.ghc-9.2.8 similarity index 72% rename from cabal.project.dist.freeze.ghc-9.2.2 rename to cabal.project.dist.freeze.ghc-9.2.8 index fe4a626..c116ebc 100644 --- a/cabal.project.dist.freeze.ghc-9.2.2 +++ b/cabal.project.dist.freeze.ghc-9.2.8 @@ -1,16 +1,16 @@ active-repositories: hackage.haskell.org:merge constraints: any.array ==0.5.4.0, - any.base ==4.16.1.0, + any.base ==4.16.4.0, any.binary ==0.8.9.0, - any.bytestring ==0.11.3.0, + any.bytestring ==0.11.4.0, any.containers ==0.6.5.1, any.deepseq ==1.4.6.1, any.ghc-bignum ==1.2, - any.ghc-boot-th ==9.2.2, + any.ghc-boot-th ==9.2.8, any.ghc-prim ==0.8.0, any.mtl ==2.2.2, any.pretty ==1.1.3.6, any.rts ==1.0.2, any.template-haskell ==2.18.0.0, any.transformers ==0.5.6.2 -index-state: hackage.haskell.org 2022-04-28T12:52:36Z +index-state: hackage.haskell.org 2023-06-09T13:53:50Z diff --git a/cabal.project.dist.freeze.ghc-9.4.5 b/cabal.project.dist.freeze.ghc-9.4.5 new file mode 100644 index 0000000..e2569f6 --- /dev/null +++ b/cabal.project.dist.freeze.ghc-9.4.5 @@ -0,0 +1,16 @@ +active-repositories: hackage.haskell.org:merge +constraints: any.array ==0.5.4.0, + any.base ==4.17.1.0, + any.binary ==0.8.9.1, + any.bytestring ==0.11.4.0, + any.containers ==0.6.7, + any.deepseq ==1.4.8.0, + any.ghc-bignum ==1.3, + any.ghc-boot-th ==9.4.5, + any.ghc-prim ==0.9.0, + any.mtl ==2.2.2, + any.pretty ==1.1.3.6, + any.rts ==1.0.2, + any.template-haskell ==2.19.0.0, + any.transformers ==0.5.6.2 +index-state: hackage.haskell.org 2023-06-09T13:53:50Z diff --git a/cabal.project.dist.freeze.ghc-9.6.2 b/cabal.project.dist.freeze.ghc-9.6.2 new file mode 100644 index 0000000..f54ffdc --- /dev/null +++ b/cabal.project.dist.freeze.ghc-9.6.2 @@ -0,0 +1,16 @@ +active-repositories: hackage.haskell.org:merge +constraints: any.array ==0.5.5.0, + any.base ==4.18.0.0, + any.binary ==0.8.9.1, + any.bytestring ==0.11.4.0, + any.containers ==0.6.7, + any.deepseq ==1.4.8.1, + any.ghc-bignum ==1.3, + any.ghc-boot-th ==9.6.2, + any.ghc-prim ==0.10.0, + any.mtl ==2.3.1, + any.pretty ==1.1.3.6, + any.rts ==1.0.2, + any.template-haskell ==2.20.0.0, + any.transformers ==0.6.1.0 +index-state: hackage.haskell.org 2023-06-09T13:53:50Z