haskell-effectful/effectful
1
1
Fork 0
mirror of https://github.com/haskell-effectful/effectful.git synced 2024-11-26 15:25:46 +03:00
Code Issues Projects Releases Wiki Activity

Update template-haskell bounds (#198)

Browse Source 
* Update template-haskell bounds

* Update GHC
This commit is contained in:
Andrzej Rybczak 2024-01-03 14:42:14 +01:00 committed by GitHub
parent a8bec72098
commit 65e8c3d652
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.github/workflows/haskell-ci.yml vendored
View File

@ -8,9 +8,9 @@
# #
# For more information, see https://github.com/haskell-CI/haskell-ci # 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 name: Haskell-CI
on: on:
@ -42,9 +42,9 @@ jobs:
compilerVersion: 9.6.3 compilerVersion: 9.6.3
setup-method: ghcup setup-method: ghcup
allow-failure: false allow-failure: false
- compiler: ghc-9.4.7 - compiler: ghc-9.4.8
compilerKind: ghc compilerKind: ghc
compilerVersion: 9.4.7 compilerVersion: 9.4.8
setup-method: ghcup setup-method: ghcup
allow-failure: false allow-failure: false
- compiler: ghc-9.2.8 - compiler: ghc-9.2.8
@ -74,10 +74,10 @@ jobs:
apt-get update apt-get update
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
mkdir -p "$HOME/.ghcup/bin" 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" chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) "$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: env:
HCKIND: ${{ matrix.compilerKind }} HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }} HCNAME: ${{ matrix.compiler }}
@ -95,7 +95,7 @@ jobs:
echo "HC=$HC" >> "$GITHUB_ENV" echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$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))') 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 "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@ -145,7 +145,7 @@ jobs:
- name: cache (tools) - name: cache (tools)
uses: actions/cache/restore@v3 uses: actions/cache/restore@v3
with: with:
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-f414aee0 key: ${{ runner.os }}-${{ matrix.compiler }}-tools-68ab2e3b
path: ~/.haskell-ci-tools path: ~/.haskell-ci-tools
- name: install cabal-plan - name: install cabal-plan
run: | run: |
@ -164,7 +164,7 @@ jobs:
uses: actions/cache/save@v3 uses: actions/cache/save@v3
if: always() if: always()
with: with:
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-f414aee0 key: ${{ runner.os }}-${{ matrix.compiler }}-tools-68ab2e3b
path: ~/.haskell-ci-tools path: ~/.haskell-ci-tools
- name: checkout - name: checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -216,11 +216,6 @@ jobs:
allow-newer: freer-simple:* allow-newer: freer-simple:*
allow-newer: fused-effects:* allow-newer: fused-effects:*
allow-newer: polysemy:* allow-newer: polysemy:*
allow-newer: *:base
allow-newer: *:bytestring
allow-newer: *:deepseq
allow-newer: *:template-haskell
allow-newer: *:text
package effectful package effectful
flags: +benchmark-foreign-libraries flags: +benchmark-foreign-libraries

7
cabal.project
View File

@ -9,10 +9,3 @@ allow-newer: cleff:*
, freer-simple:* , freer-simple:*
, fused-effects:* , fused-effects:*
, polysemy:* , polysemy:*
-- GHC 9.8
allow-newer: *:base
, *:bytestring
, *:deepseq
, *:template-haskell
, *:text

2
effectful-core/effectful-core.cabal
View File

@ -21,7 +21,7 @@ extra-source-files:
CHANGELOG.md CHANGELOG.md
README.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 || ==9.8.1
bug-reports: https://github.com/haskell-effectful/effectful/issues bug-reports: https://github.com/haskell-effectful/effectful/issues

2
effectful-plugin/effectful-plugin.cabal
View File

@ -17,7 +17,7 @@ description:
extra-source-files: CHANGELOG.md extra-source-files: CHANGELOG.md
README.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 || ==9.8.1
bug-reports: https://github.com/haskell-effectful/effectful/issues bug-reports: https://github.com/haskell-effectful/effectful/issues

4
effectful-th/effectful-th.cabal
View File

@ -17,7 +17,7 @@ extra-source-files:
CHANGELOG.md CHANGELOG.md
README.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 || ==9.8.1
bug-reports: https://github.com/haskell-effectful/effectful/issues bug-reports: https://github.com/haskell-effectful/effectful/issues
@ -59,7 +59,7 @@ library
, containers >= 0.6 , containers >= 0.6
, effectful-core >= 1.0.0.0 && < 3.0.0.0 , effectful-core >= 1.0.0.0 && < 3.0.0.0
, exceptions >= 0.10.4 , exceptions >= 0.10.4
, template-haskell >= 2.15 && < 2.21 , template-haskell >= 2.15 && < 2.22
, th-abstraction >= 0.6 && < 0.7 , th-abstraction >= 0.6 && < 0.7
hs-source-dirs: src hs-source-dirs: src

2
effectful/effectful.cabal
View File

@ -22,7 +22,7 @@ extra-source-files:
CHANGELOG.md CHANGELOG.md
README.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 || ==9.8.1
bug-reports: https://github.com/haskell-effectful/effectful/issues bug-reports: https://github.com/haskell-effectful/effectful/issues