diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index de4e153..be7db34 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20241121 +# version: 0.19.20241202 # -# REGENDATA ("0.19.20241121",["github","--config=cabal.haskell-ci","cabal.project"]) +# REGENDATA ("0.19.20241202",["github","--config=cabal.haskell-ci","cabal.project"]) # name: Haskell-CI on: @@ -32,20 +32,20 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.0.20241114 + - compiler: ghc-9.12.1 compilerKind: ghc - compilerVersion: 9.12.0.20241114 - setup-method: ghcup-prerelease + compilerVersion: 9.12.1 + setup-method: ghcup-vanilla allow-failure: false - compiler: ghc-9.10.1 compilerKind: ghc compilerVersion: 9.10.1 setup-method: ghcup allow-failure: false - - compiler: ghc-9.8.3 + - compiler: ghc-9.8.4 compilerKind: ghc - compilerVersion: 9.8.3 - setup-method: ghcup-vanilla + compilerVersion: 9.8.4 + setup-method: ghcup allow-failure: false - compiler: ghc-9.6.5 compilerKind: ghc @@ -115,21 +115,6 @@ jobs: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} HCVER: ${{ matrix.compilerVersion }} - - name: Install GHC (GHCup prerelease) - if: matrix.setup-method == 'ghcup-prerelease' - run: | - "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml; - "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) - HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") - HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') - HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') - echo "HC=$HC" >> "$GITHUB_ENV" - echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" - echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - env: - HCKIND: ${{ matrix.compilerKind }} - HCNAME: ${{ matrix.compiler }} - HCVER: ${{ matrix.compilerVersion }} - name: Set PATH and environment variables run: | echo "$HOME/.cabal/bin" >> $GITHUB_PATH @@ -196,7 +181,7 @@ jobs: - name: cache (tools) uses: actions/cache/restore@v4 with: - key: ${{ runner.os }}-${{ matrix.compiler }}-tools-f1965066 + key: ${{ runner.os }}-${{ matrix.compiler }}-tools-11815553 path: ~/.haskell-ci-tools - name: install cabal-plan run: | @@ -215,7 +200,7 @@ jobs: if: always() uses: actions/cache/save@v4 with: - key: ${{ runner.os }}-${{ matrix.compiler }}-tools-f1965066 + key: ${{ runner.os }}-${{ matrix.compiler }}-tools-11815553 path: ~/.haskell-ci-tools - name: checkout uses: actions/checkout@v4 @@ -267,6 +252,8 @@ jobs: allow-newer: freer-simple:* allow-newer: fused-effects:* allow-newer: polysemy:* + allow-newer: async:base + allow-newer: hashable:base package effectful flags: +benchmark-foreign-libraries diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 9479576..c47ec2d 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -10,8 +10,6 @@ jobs-selection: any installed: -all -ghc-version-mapping: 9.12.1:9.12.0.20241114 - raw-project package effectful flags: +benchmark-foreign-libraries diff --git a/cabal.project b/cabal.project index 1dd2090..075fd90 100644 --- a/cabal.project +++ b/cabal.project @@ -9,3 +9,7 @@ allow-newer: cleff:* , freer-simple:* , fused-effects:* , polysemy:* + +-- GHC 9.12.1 +allow-newer: async:base + , hashable:base diff --git a/effectful-core/effectful-core.cabal b/effectful-core/effectful-core.cabal index 48d7fff..0ff9a82 100644 --- a/effectful-core/effectful-core.cabal +++ b/effectful-core/effectful-core.cabal @@ -21,7 +21,7 @@ extra-source-files: CHANGELOG.md README.md -tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.5, 9.8.3, 9.10.1, 9.12.1 } +tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.5, 9.8.4, 9.10.1, 9.12.1 } bug-reports: https://github.com/haskell-effectful/effectful/issues source-repository head diff --git a/effectful-plugin/effectful-plugin.cabal b/effectful-plugin/effectful-plugin.cabal index e9c6cc4..ed4bc4f 100644 --- a/effectful-plugin/effectful-plugin.cabal +++ b/effectful-plugin/effectful-plugin.cabal @@ -17,7 +17,7 @@ description: extra-source-files: CHANGELOG.md README.md -tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.5, 9.8.3, 9.10.1, 9.12.1 } +tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.5, 9.8.4, 9.10.1, 9.12.1 } bug-reports: https://github.com/haskell-effectful/effectful/issues source-repository head diff --git a/effectful-th/effectful-th.cabal b/effectful-th/effectful-th.cabal index 81518b9..3d64fab 100644 --- a/effectful-th/effectful-th.cabal +++ b/effectful-th/effectful-th.cabal @@ -17,7 +17,7 @@ extra-source-files: CHANGELOG.md README.md -tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.5, 9.8.3, 9.10.1, 9.12.1 } +tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.5, 9.8.4, 9.10.1, 9.12.1 } bug-reports: https://github.com/haskell-effectful/effectful/issues source-repository head diff --git a/effectful/effectful.cabal b/effectful/effectful.cabal index 388e6c1..e6c4ac9 100644 --- a/effectful/effectful.cabal +++ b/effectful/effectful.cabal @@ -22,7 +22,7 @@ extra-source-files: CHANGELOG.md README.md -tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.5, 9.8.3, 9.10.1, 9.12.1 } +tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.5, 9.8.4, 9.10.1, 9.12.1 } bug-reports: https://github.com/haskell-effectful/effectful/issues source-repository head @@ -188,8 +188,8 @@ benchmark bench if impl(ghc < 9.9) build-depends: freer-simple >= 1.2.1.2 - if impl(ghc < 9.11) - build-depends: fused-effects >= 1.1.2.2 + if impl(ghc < 9.13) + build-depends: fused-effects >= 1.1.2.3 if impl(ghc < 9.11) build-depends: polysemy >= 1.9.2.0