diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index e674881..5fc3c6c 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.17.20231010 +# version: 0.17.20231219 # -# REGENDATA ("0.17.20231010",["github","--config=cabal.haskell-ci","cabal.project"]) +# REGENDATA ("0.17.20231219",["github","--config=cabal.haskell-ci","cabal.project"]) # name: Haskell-CI on: @@ -42,9 +42,9 @@ jobs: compilerVersion: 9.6.3 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.7 + - compiler: ghc-9.4.8 compilerKind: ghc - compilerVersion: 9.4.7 + compilerVersion: 9.4.8 setup-method: ghcup allow-failure: false - compiler: ghc-9.2.8 @@ -74,10 +74,10 @@ jobs: apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -95,7 +95,7 @@ jobs: echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" @@ -145,7 +145,7 @@ jobs: - name: cache (tools) uses: actions/cache/restore@v3 with: - key: ${{ runner.os }}-${{ matrix.compiler }}-tools-f414aee0 + key: ${{ runner.os }}-${{ matrix.compiler }}-tools-68ab2e3b path: ~/.haskell-ci-tools - name: install cabal-plan run: | @@ -164,7 +164,7 @@ jobs: uses: actions/cache/save@v3 if: always() with: - key: ${{ runner.os }}-${{ matrix.compiler }}-tools-f414aee0 + key: ${{ runner.os }}-${{ matrix.compiler }}-tools-68ab2e3b path: ~/.haskell-ci-tools - name: checkout uses: actions/checkout@v3 @@ -216,11 +216,6 @@ jobs: allow-newer: freer-simple:* allow-newer: fused-effects:* allow-newer: polysemy:* - allow-newer: *:base - allow-newer: *:bytestring - allow-newer: *:deepseq - allow-newer: *:template-haskell - allow-newer: *:text package effectful flags: +benchmark-foreign-libraries diff --git a/cabal.project b/cabal.project index ff16590..1dd2090 100644 --- a/cabal.project +++ b/cabal.project @@ -9,10 +9,3 @@ allow-newer: cleff:* , freer-simple:* , fused-effects:* , polysemy:* - --- GHC 9.8 -allow-newer: *:base - , *:bytestring - , *:deepseq - , *:template-haskell - , *:text diff --git a/effectful-core/effectful-core.cabal b/effectful-core/effectful-core.cabal index 8bae99c..3cdfbc3 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.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.7 || ==9.6.3 +tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.3 || ==9.8.1 bug-reports: https://github.com/haskell-effectful/effectful/issues diff --git a/effectful-plugin/effectful-plugin.cabal b/effectful-plugin/effectful-plugin.cabal index 811e95d..bb0fa73 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.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.7 || ==9.6.3 +tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.3 || ==9.8.1 bug-reports: https://github.com/haskell-effectful/effectful/issues diff --git a/effectful-th/effectful-th.cabal b/effectful-th/effectful-th.cabal index 04844a4..55d95f3 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.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.7 || ==9.6.3 +tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.3 || ==9.8.1 bug-reports: https://github.com/haskell-effectful/effectful/issues @@ -59,7 +59,7 @@ library , containers >= 0.6 , effectful-core >= 1.0.0.0 && < 3.0.0.0 , exceptions >= 0.10.4 - , template-haskell >= 2.15 && < 2.21 + , template-haskell >= 2.15 && < 2.22 , th-abstraction >= 0.6 && < 0.7 hs-source-dirs: src diff --git a/effectful/effectful.cabal b/effectful/effectful.cabal index b3b798a..95412e5 100644 --- a/effectful/effectful.cabal +++ b/effectful/effectful.cabal @@ -22,7 +22,7 @@ extra-source-files: CHANGELOG.md README.md -tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.7 || ==9.6.3 +tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.3 || ==9.8.1 bug-reports: https://github.com/haskell-effectful/effectful/issues