From b845c6a852bf7622e2a9cabb618177b01aaefe8a Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Fri, 26 Jul 2024 15:15:21 +1000 Subject: [PATCH 1/2] Make it build with ghc-9.10 Also update the version of `tar` being used. --- hedgehog-extras.cabal | 4 ++-- src/Hedgehog/Extras/Test/Network.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hedgehog-extras.cabal b/hedgehog-extras.cabal index 43fb0ce2..0a1f2a53 100644 --- a/hedgehog-extras.cabal +++ b/hedgehog-extras.cabal @@ -19,7 +19,7 @@ source-repository head common aeson { build-depends: aeson >= 2.0.0.0 } common aeson-pretty { build-depends: aeson-pretty >= 0.8.5 } common async { build-depends: async } -common base { build-depends: base >= 4.12 && < 4.20 } +common base { build-depends: base >= 4.12 && < 4.21 } common bytestring { build-depends: bytestring } common deepseq { build-depends: deepseq } common Diff { build-depends: Diff } @@ -38,7 +38,7 @@ common network { build-depends: network common process { build-depends: process } common resourcet { build-depends: resourcet } common stm { build-depends: stm } -common tar { build-depends: tar < 0.6 } +common tar { build-depends: tar ^>= 0.6 } common tasty { build-depends: tasty } common tasty-hedgehog { build-depends: tasty-hedgehog } common tasty-quickcheck { build-depends: tasty-quickcheck } diff --git a/src/Hedgehog/Extras/Test/Network.hs b/src/Hedgehog/Extras/Test/Network.hs index bcf4e407..556e2fea 100644 --- a/src/Hedgehog/Extras/Test/Network.hs +++ b/src/Hedgehog/Extras/Test/Network.hs @@ -86,7 +86,7 @@ downloadToFile url path = GHC.withFrozenCallStack $ do H.note_ $ "Downloading " <> url <> " to " <> path H.evalIO $ HTTP.simpleHttp url >>= LBS.writeFile path -tarErrors :: TAR.Entries (Either TAR.FormatError TAR.TarBombError) -> [Either TAR.FormatError TAR.TarBombError] +tarErrors :: TAR.GenEntries tarPath linkTarget e -> [e] tarErrors entries = TAR.foldEntries (flip const) id (:) entries [] -- | Download a github commit to a temporary directory, extract it and return the path to the extracted directory. From 8e923cfa48f351e60e948e444cb88dd32051887a Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Fri, 26 Jul 2024 15:31:41 +1000 Subject: [PATCH 2/2] CI: Add ghc-9,.10 to the build matrix --- .github/workflows/haskell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index f240dfb2..e8653fe9 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["9.2.8", "9.6.5", "9.8.2"] + ghc: ["9.2.8", "9.6.5", "9.8.2", "9.10.1"] os: [ubuntu-latest, macos-latest, windows-latest] cabal: ["3.10.3.0"]