From 91c4c41a45b080a0c486bc27c14349fb92fdcff0 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Tue, 21 May 2024 16:44:25 +1000 Subject: [PATCH 1/2] Make it build with ghc 9.10 --- haskeline.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haskeline.cabal b/haskeline.cabal index 10d7e78..c986ad7 100644 --- a/haskeline.cabal +++ b/haskeline.cabal @@ -63,7 +63,7 @@ Library -- We require ghc>=7.4.1 (base>=4.5) to use the base library encodings, even -- though it was implemented in earlier releases, due to GHC bug #5436 which -- wasn't fixed until 7.4.1 - Build-depends: base >=4.9 && < 4.20, containers>=0.4 && < 0.8, + Build-depends: base >=4.9 && < 4.21, containers>=0.4 && < 0.8, directory>=1.1 && < 1.4, bytestring>=0.9 && < 0.13, filepath >= 1.2 && < 1.6, transformers >= 0.2 && < 0.7, process >= 1.0 && < 1.7, stm >= 2.4 && < 2.6, From 6758c914603b072aba26d2bc6ed59d0919fbd516 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Tue, 21 May 2024 16:45:39 +1000 Subject: [PATCH 2/2] CI: Add ghc 9.10 to the build matrix --- .github/workflows/haskell-ci.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 14cc6f4..5a4b99e 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -32,14 +32,19 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.8.0.20230919 + - compiler: ghc-9.10.1 compilerKind: ghc - compilerVersion: 9.8.0.20230919 + compilerVersion: 9.10.1 setup-method: ghcup allow-failure: true - - compiler: ghc-9.6.3 + - compiler: ghc-9.8.2 compilerKind: ghc - compilerVersion: 9.6.3 + compilerVersion: 9.8.2 + setup-method: ghcup + allow-failure: true + - compiler: ghc-9.6.5 + compilerKind: ghc + compilerVersion: 9.6.5 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.7