From 36f6d93ecfceb46d7bc9cd4f32f7e56e2d5a622d Mon Sep 17 00:00:00 2001 From: Joris Date: Fri, 2 Jun 2023 17:19:57 +0200 Subject: [PATCH 1/3] Build with `ghc-9.4` and `ghc-9.6` --- .github/workflows/haskell.yml | 12 ++++++------ diff-containers/diff-containers.cabal | 6 +++--- fingertree-rm/fingertree-rm.cabal | 8 ++++---- simple-semigroupoids/simple-semigroupoids.cabal | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 6c881b5..ca7db47 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -16,8 +16,8 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["8.10.7", "9.2.7"] - cabal: ["3.8.1.0"] + ghc: ["8.10.7", "9.2.8", "9.4.5", "9.6.2"] + cabal: ["3.10.1.0"] os: [ubuntu-latest, windows-latest, macOS-latest] steps: @@ -73,8 +73,8 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["9.2.7"] - cabal: ["3.8.1.0"] + ghc: ["9.2.8"] + cabal: ["3.10.1.0"] os: [ubuntu-latest] steps: @@ -133,8 +133,8 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["9.2.7"] - cabal: ["3.8.1.0"] + ghc: ["9.2.8"] + cabal: ["3.10.1.0"] os: [ubuntu-latest] steps: diff --git a/diff-containers/diff-containers.cabal b/diff-containers/diff-containers.cabal index 7a974de..6cdd8d3 100644 --- a/diff-containers/diff-containers.cabal +++ b/diff-containers/diff-containers.cabal @@ -14,7 +14,7 @@ author: Joris Dral maintainer: operations@iohk.io category: Data Structures build-type: Simple -tested-with: GHC ==8.10 || ==9.2 +tested-with: GHC ==8.10 || ==9.2 || ==9.4 || ==9.6 library default-language: Haskell2010 @@ -25,7 +25,7 @@ library other-modules: Data.Sequence.NonEmpty.Extra build-depends: - , base >=4.9 && <4.17 + , base >=4.9 && <4.19 , containers , monoid-subclasses , nonempty-containers @@ -47,7 +47,7 @@ test-suite test Test.Util build-depends: - , base >=4.9 && <4.17 + , base >=4.9 && <4.19 , containers , diff-containers , nonempty-containers diff --git a/fingertree-rm/fingertree-rm.cabal b/fingertree-rm/fingertree-rm.cabal index cf14b79..877de15 100644 --- a/fingertree-rm/fingertree-rm.cabal +++ b/fingertree-rm/fingertree-rm.cabal @@ -14,14 +14,14 @@ author: Joris Dral maintainer: operations@iohk.io category: Data Structures build-type: Simple -tested-with: GHC ==8.10 || ==9.2 +tested-with: GHC ==8.10 || ==9.2 || ==9.4 || ==9.6 library default-language: Haskell2010 hs-source-dirs: src exposed-modules: Data.FingerTree.RootMeasured.Strict build-depends: - , base >=4.9 && <4.17 + , base >=4.9 && <4.19 , cardano-strict-containers , monoid-subclasses , nothunks @@ -39,7 +39,7 @@ test-suite test main-is: Main.hs other-modules: Test.Data.FingerTree.RootMeasured.Strict build-depends: - , base >=4.9 && <4.17 + , base >=4.9 && <4.19 , fingertree-rm , simple-semigroupoids , tasty @@ -58,7 +58,7 @@ benchmark bench main-is: Main.hs other-modules: Bench.Data.FingerTree.RootMeasured.Strict build-depends: - , base >=4.9 && <4.17 + , base >=4.9 && <4.19 , cardano-strict-containers , deepseq , fingertree diff --git a/simple-semigroupoids/simple-semigroupoids.cabal b/simple-semigroupoids/simple-semigroupoids.cabal index ea64131..3727ab6 100644 --- a/simple-semigroupoids/simple-semigroupoids.cabal +++ b/simple-semigroupoids/simple-semigroupoids.cabal @@ -14,7 +14,7 @@ author: Joris Dral maintainer: operations@iohk.io category: Control, Testing build-type: Simple -tested-with: GHC ==8.10 || ==9.2 +tested-with: GHC ==8.10 || ==9.2 || ==9.4 || ==9.6 library default-language: Haskell2010 @@ -25,7 +25,7 @@ library Data.Semigroupoid.Simple.Laws build-depends: - , base >=4.9 && <4.17 + , base >=4.9 && <4.19 , groups , QuickCheck , tasty @@ -44,7 +44,7 @@ test-suite test main-is: Main.hs other-modules: Test.Data.Semigroupoid.Simple build-depends: - , base >=4.9 && <4.17 + , base >=4.9 && <4.19 , simple-semigroupoids , tasty , tasty-quickcheck From 26afa3198868a476730d913f3cd593b1a6296c4c Mon Sep 17 00:00:00 2001 From: Joris Date: Fri, 2 Jun 2023 17:25:46 +0200 Subject: [PATCH 2/3] Fix redundancy in GitHub workflows cache names --- .github/workflows/haskell.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index ca7db47..211123b 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -47,13 +47,12 @@ jobs: - name: Cache cabal store uses: actions/cache@v3 env: - cache-name: cache-cabal + cache-name: cache-cabal-build with: path: ${{ steps.setup-haskell.outputs.cabal-store }} - key: ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }} + key: ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }} restore-keys: | - ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}- - ${{ runner.os }}-${{ matrix.ghc }}-build- + ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}- ${{ runner.os }}-${{ matrix.ghc }}- ${{ runner.os }}- @@ -106,10 +105,9 @@ jobs: cache-name: cache-cabal-stylish with: path: ${{ steps.setup-haskell.outputs.cabal-store }} - key: ${{ runner.os }}-${{ matrix.ghc }}-stylish-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }} + key: ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }} restore-keys: | - ${{ runner.os }}-${{ matrix.ghc }}-stylish-${{ env.cache-name }}- - ${{ runner.os }}-${{ matrix.ghc }}-stylish- + ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}- ${{ runner.os }}-${{ matrix.ghc }}- ${{ runner.os }}- @@ -168,9 +166,8 @@ jobs: path: ${{ steps.setup-haskell.outputs.cabal-store }} key: ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }} restore-keys: | - ${{ runner.os }}-${{ matrix.ghc }}-cabal-fmt-${{ env.cache-name }}- - ${{ runner.os }}-${{ matrix.ghc }}-cabal-fmt - ${{ runner.os }}-${{ matrix.ghc }} + ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}- + ${{ runner.os }}-${{ matrix.ghc }}- ${{ runner.os }}- - name: Install cabal-fmt From 39e809032171938080e41f1a4991b1e19a3d5b5d Mon Sep 17 00:00:00 2001 From: Joris Date: Fri, 2 Jun 2023 17:41:04 +0200 Subject: [PATCH 3/3] Add changelog entries --- diff-containers/CHANGELOG.md | 1 + fingertree-rm/CHANGELOG.md | 6 ++++++ simple-semigroupoids/CHANGELOG.md | 6 +++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/diff-containers/CHANGELOG.md b/diff-containers/CHANGELOG.md index 5616b30..1ea4b50 100644 --- a/diff-containers/CHANGELOG.md +++ b/diff-containers/CHANGELOG.md @@ -3,6 +3,7 @@ ### Patch * Fix laziness in the `Functor` instance for `Diff`. +* Make buildable with `ghc-9.4` and `ghc-9.6`. ## 1.0.1.0 — 2023-05-11 diff --git a/fingertree-rm/CHANGELOG.md b/fingertree-rm/CHANGELOG.md index ce1745b..a32aadb 100644 --- a/fingertree-rm/CHANGELOG.md +++ b/fingertree-rm/CHANGELOG.md @@ -1,3 +1,9 @@ +## next version + +### Patch + +* Make buildable with `ghc-9.4` and `ghc-9.6`. + ## 1.0.0.0 — 2023-05-09 ### Breaking changes diff --git a/simple-semigroupoids/CHANGELOG.md b/simple-semigroupoids/CHANGELOG.md index b853c8d..e77b459 100644 --- a/simple-semigroupoids/CHANGELOG.md +++ b/simple-semigroupoids/CHANGELOG.md @@ -1,5 +1,9 @@ +## next version + +### Patch + +* Make buildable with `ghc-9.4` and `ghc-9.6`. - ## 0.1.0.0 — 2023-02-16 First release