From 15d73bcf83638565f78b36ec7538354d5fc88258 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Thu, 30 Nov 2023 15:00:40 +1100 Subject: [PATCH 1/2] Make it build with ghc-9.8 --- cabal.project | 6 ++++++ fs-api/fs-api.cabal | 6 +++--- fs-sim/fs-sim.cabal | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/cabal.project b/cabal.project index 3563fc1..4e2a83d 100644 --- a/cabal.project +++ b/cabal.project @@ -17,3 +17,9 @@ packages: 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 + diff --git a/fs-api/fs-api.cabal b/fs-api/fs-api.cabal index 6592a39..878c67d 100644 --- a/fs-api/fs-api.cabal +++ b/fs-api/fs-api.cabal @@ -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 diff --git a/fs-sim/fs-sim.cabal b/fs-sim/fs-sim.cabal index fee115a..c3d5fd1 100644 --- a/fs-sim/fs-sim.cabal +++ b/fs-sim/fs-sim.cabal @@ -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 From 3df7177e0b0477420e37faa4ae00b4b634cce873 Mon Sep 17 00:00:00 2001 From: Joris Dral Date: Thu, 30 Nov 2023 10:00:22 +0100 Subject: [PATCH 2/2] Make it build with ghc-9.8, continued --- .github/workflows/haskell.yml | 21 +++++++++++++-------- cabal.project | 7 ++++++- fs-api/CHANGELOG.md | 6 ++++++ fs-sim/CHANGELOG.md | 6 ++++++ fs-sim/fs-sim.cabal | 4 ++-- 5 files changed, 33 insertions(+), 11 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 53a5138..0b704a8 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -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" ] @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/cabal.project b/cabal.project index 4e2a83d..9e73ba9 100644 --- a/cabal.project +++ b/cabal.project @@ -10,6 +10,12 @@ 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 @@ -22,4 +28,3 @@ if impl(ghc >=9.8) allow-newer: -- https://github.com/wrengr/unix-bytestring/pull/46 , unix-bytestring:base - diff --git a/fs-api/CHANGELOG.md b/fs-api/CHANGELOG.md index e754485..7924768 100644 --- a/fs-api/CHANGELOG.md +++ b/fs-api/CHANGELOG.md @@ -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 diff --git a/fs-sim/CHANGELOG.md b/fs-sim/CHANGELOG.md index 753b4ef..2f502da 100644 --- a/fs-sim/CHANGELOG.md +++ b/fs-sim/CHANGELOG.md @@ -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 diff --git a/fs-sim/fs-sim.cabal b/fs-sim/fs-sim.cabal index c3d5fd1..c4f1700 100644 --- a/fs-sim/fs-sim.cabal +++ b/fs-sim/fs-sim.cabal @@ -14,7 +14,7 @@ maintainer: operations@iohk.io 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 @@ -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