From 5f31fe0c792518ea541e210a19b67697802a1d90 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Mon, 29 Dec 2025 14:39:29 +0100 Subject: [PATCH 1/2] Bump CI to latest GHCup tracked GHCs --- .github/workflows/haskell.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index c6a0a90..bad6219 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -1,6 +1,10 @@ name: Haskell CI -on: [push, pull_request] +on: + push: + branches: [master] + pull_request: + branches: [master] jobs: build: @@ -8,21 +12,22 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ghc: [ '8.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.2.8', '9.4.8', '9.6.5', '9.8.2', '9.10.1' ] + ghc: [ '8.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.2.8', '9.4.8', '9.6.7', '9.8.4', '9.10.3', '9.12.2' ] + steps: - - uses: actions/checkout@v4 - - uses: haskell/actions/setup@v2 + - uses: actions/checkout@v6 + - uses: haskell-actions/setup@v2 with: ghc-version: ${{ matrix.ghc }} - cabal-version: '3.10' + cabal-version: latest - name: cabal Cache - uses: actions/cache@v3 + uses: actions/cache@v5 env: cache-name: cache-cabal with: path: ~/.cabal - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }} + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build- From 78d2f681af84ae4b469eeeca95201100f1afbc87 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Mon, 29 Dec 2025 14:44:03 +0100 Subject: [PATCH 2/2] Allow containers-0.8 for GHC 9.14 --- witherable/witherable.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/witherable/witherable.cabal b/witherable/witherable.cabal index 4630024..f1bc9bc 100644 --- a/witherable/witherable.cabal +++ b/witherable/witherable.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: witherable version: 0.5 -x-revision: 1 +x-revision: 2 synopsis: filterable traversable description: A stronger variant of `traverse` which can remove elements and generalised mapMaybe, catMaybes, filter homepage: https://github.com/fumieval/witherable @@ -14,7 +14,7 @@ category: Data build-type: Simple extra-source-files: CHANGELOG.md tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || - ==9.0.1 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2 || ==9.10.1 + ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.4 || ==9.10.3 || ==9.12.2 source-repository head type: git @@ -26,7 +26,7 @@ library Witherable build-depends: base >=4.9 && <5, base-orphans >=0.8.4 && <0.10, - containers >=0.5.7.1 && <0.8, + containers >=0.5.7.1 && <0.9, hashable >=1.2.7.0 && <1.6, transformers >=0.5.2.0 && <0.7, unordered-containers >=0.2.12.0 && <0.3,