From a9cf654051078785d2d9b8316b55315e6ca9eaac Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Sat, 11 May 2024 17:44:37 +0100 Subject: [PATCH 1/2] Fix cache directory --- .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 7990175..69ab07f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: - uses: actions/cache@v3 - name: Cache ~/.cabal/3tore + name: Cache ~/.cabal/store with: path: ~/.cabal/store key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }} From 881cd19389bfb2d8ceed34afdf708266b36a5572 Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Sat, 11 May 2024 17:44:49 +0100 Subject: [PATCH 2/2] Suuport base < 4.21 (i.e. support GHC 9.10) --- trial-example/trial-example.cabal | 2 +- trial-optparse-applicative/trial-optparse-applicative.cabal | 2 +- trial-tomland/trial-tomland.cabal | 2 +- trial/trial.cabal | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/trial-example/trial-example.cabal b/trial-example/trial-example.cabal index 28f064e..401f92f 100644 --- a/trial-example/trial-example.cabal +++ b/trial-example/trial-example.cabal @@ -26,7 +26,7 @@ source-repository head common common-options - build-depends: base >= 4.12.0.0 && < 4.20 + build-depends: base >= 4.12.0.0 && < 4.21 , trial , trial-optparse-applicative , trial-tomland diff --git a/trial-optparse-applicative/trial-optparse-applicative.cabal b/trial-optparse-applicative/trial-optparse-applicative.cabal index 1a0f81e..c2db785 100644 --- a/trial-optparse-applicative/trial-optparse-applicative.cabal +++ b/trial-optparse-applicative/trial-optparse-applicative.cabal @@ -26,7 +26,7 @@ source-repository head location: https://github.com/kowainik/trial.git common common-options - build-depends: base >= 4.12.0.0 && < 4.20 + build-depends: base >= 4.12.0.0 && < 4.21 ghc-options: -Wall -Wcompat diff --git a/trial-tomland/trial-tomland.cabal b/trial-tomland/trial-tomland.cabal index e627033..fa78f39 100644 --- a/trial-tomland/trial-tomland.cabal +++ b/trial-tomland/trial-tomland.cabal @@ -26,7 +26,7 @@ source-repository head location: https://github.com/kowainik/trial.git common common-options - build-depends: base >= 4.12.0.0 && < 4.20 + build-depends: base >= 4.12.0.0 && < 4.21 ghc-options: -Wall -Wcompat diff --git a/trial/trial.cabal b/trial/trial.cabal index 11f996b..fdc7d60 100644 --- a/trial/trial.cabal +++ b/trial/trial.cabal @@ -55,7 +55,7 @@ source-repository head location: https://github.com/kowainik/trial.git common common-options - build-depends: base >= 4.12.0.0 && < 4.20 + build-depends: base >= 4.12.0.0 && < 4.21 ghc-options: -Wall -Wcompat