Skip to content
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.

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

Make it build with ghc-9.8 #38

Merged
merged 2 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 13 additions & 8 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
name: Haskell CI

# Limit concurrent runs of this workflow within a single PR
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

on:
push:
branches: [ "main" ]
Expand All @@ -16,8 +21,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["8.10.7", "9.2.7", "9.4.5", "9.6.1"]
cabal: ["3.10.1.0"]
ghc: ["8.10.7", "9.2.8", "9.4.8", "9.6.3", "9.8.1"]
cabal: ["3.10.2.0"]
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
Expand Down Expand Up @@ -72,8 +77,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.2.7"]
cabal: ["3.10.1.0"]
ghc: ["9.2.8"]
cabal: ["3.10.2.0"]
os: [ubuntu-latest]

steps:
Expand Down Expand Up @@ -131,8 +136,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.2.7"]
cabal: ["3.10.1.0"]
ghc: ["9.2.8"]
cabal: ["3.10.2.0"]
os: [ubuntu-latest]

steps:
Expand Down Expand Up @@ -190,8 +195,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.2.7"]
cabal: ["3.10.1.0"]
ghc: ["9.2.8"]
cabal: ["3.10.2.0"]
os: [ubuntu-latest]

steps:
Expand Down
11 changes: 11 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,21 @@ repository cardano-haskell-packages
c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee

index-state:
-- Bump this if you need newer packages from Hackage
, hackage.haskell.org 2023-11-30T00:00:00Z
-- Bump this if you need newer packages from CHaP
, cardano-haskell-packages 2023-11-30T00:00:00Z

packages:
fs-api
fs-sim

tests: True
test-show-details: direct
benchmarks: True

if impl(ghc >=9.8)
allow-newer:
-- https://github.com/wrengr/unix-bytestring/pull/46
, unix-bytestring:base
6 changes: 6 additions & 0 deletions fs-api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Revision history for fs-api

## ??? -- ???

### Patch

* Make it build with `ghc-9.8`.

## 0.2.0.0 -- 2023-08-01

### Breaking
Expand Down
6 changes: 3 additions & 3 deletions fs-api/fs-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ library

default-language: Haskell2010
build-depends:
, base >=4.14 && <4.19
, bytestring >=0.10 && <0.12
, base >=4.14 && <4.20
, bytestring >=0.10 && <0.13
, containers >=0.5 && <0.7
, deepseq
, digest
, directory >=1.3 && <1.4
, filepath >=1.4 && <1.5
, io-classes >=0.3 && <1.4
, text >=1.2 && <2.1
, text >=1.2 && <2.2

if os(windows)
build-depends: Win32 >=2.6.1.0
Expand Down
6 changes: 6 additions & 0 deletions fs-sim/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Revision history for fs-sim

## ??? -- ???

### Patch

* Make it build with `ghc-9.8`.

## 0.2.1.0 -- 2023-08-01

### Non-breaking
Expand Down
10 changes: 5 additions & 5 deletions fs-sim/fs-sim.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ maintainer: [email protected]
category: Testing
build-type: Simple
extra-doc-files: CHANGELOG.md
tested-with: GHC ==8.10 || ==9.2 || ==9.4 || ==9.6
tested-with: GHC ==8.10 || ==9.2 || ==9.4 || ==9.6 || ==9.8

source-repository head
type: git
Expand All @@ -33,16 +33,16 @@ library

default-language: Haskell2010
build-depends:
, base >=4.14 && <4.19
, base >=4.14 && <4.20
, base16-bytestring
, bytestring >=0.10 && <0.12
, bytestring >=0.10 && <0.13
, containers >=0.5 && <0.7
, fs-api ^>=0.2
, io-classes >=0.3 && <1.4
, mtl
, QuickCheck
, strict-stm >=0.3 && <1.4
, text >=1.2 && <2.1
, text >=1.2 && <2.2

ghc-options:
-Wall -Wcompat -Wincomplete-uni-patterns
Expand All @@ -69,7 +69,7 @@ test-suite fs-sim-test
, generics-sop
, pretty-show
, QuickCheck
, quickcheck-state-machine >=0.7.2
, quickcheck-state-machine >=0.7.2 && <0.8
, random
, tasty
, tasty-hunit
Expand Down
Loading