Skip to content

Build with ghc-9.4 and ghc-9.6 #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 5, 2023
Merged

Build with ghc-9.4 and ghc-9.6 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36f6d93
Build with `ghc-9.4` and `ghc-9.6`
jorisdral Jun 2, 2023
26afa31
Fix redundancy in GitHub workflows cache names
jorisdral Jun 2, 2023
39e8090
Add changelog entries
jorisdral Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions .github/workflows/haskell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}-

Expand All @@ -73,8 +72,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:
Expand Down Expand Up @@ -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 }}-

Expand All @@ -133,8 +131,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:
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions diff-containers/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions diff-containers/diff-containers.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 6 additions & 0 deletions fingertree-rm/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions fingertree-rm/fingertree-rm.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 5 additions & 1 deletion simple-semigroupoids/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## next version

### Patch

* Make buildable with `ghc-9.4` and `ghc-9.6`.

<a id='changelog-0.1.0.0'></a>
## 0.1.0.0 — 2023-02-16

First release
6 changes: 3 additions & 3 deletions simple-semigroupoids/simple-semigroupoids.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,7 +25,7 @@ library
Data.Semigroupoid.Simple.Laws

build-depends:
, base >=4.9 && <4.17
, base >=4.9 && <4.19
, groups
, QuickCheck
, tasty
Expand All @@ -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
Expand Down