Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI #286

Merged
merged 1 commit into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 12 additions & 25 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions cabal.haskell-ci
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ allow-newer: cleff:*
, freer-simple:*
, fused-effects:*
, polysemy:*

-- GHC 9.12.1
allow-newer: async:base
, hashable:base
2 changes: 1 addition & 1 deletion effectful-core/effectful-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion effectful-plugin/effectful-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion effectful-th/effectful-th.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions effectful/effectful.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading