Skip to content

Commit

Permalink
Merge pull request #231 from gregwebs/mac-ci-14
Browse files Browse the repository at this point in the history
Mac CI: drop GHC 8.10 and 9.0 (not supported by macos-latest)
  • Loading branch information
gregwebs committed May 3, 2024
2 parents 44873ae + 9580359 commit 0acc633
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
14 changes: 7 additions & 7 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/andreasabel/haskell-ci
#
# version: 0.19.20240416
# version: 0.19.20240429
#
# REGENDATA ("0.19.20240416",["github","shelly.cabal"])
# REGENDATA ("0.19.20240429",["github","shelly.cabal"])
#
name: Haskell-CI
on:
Expand All @@ -27,24 +27,24 @@ jobs:
timeout-minutes:
60
container:
image: buildpack-deps:focal
image: buildpack-deps:jammy
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
include:
- compiler: ghc-9.10.0.20240413
- compiler: ghc-9.10.0.20240426
compilerKind: ghc
compilerVersion: 9.10.0.20240413
compilerVersion: 9.10.0.20240426
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.8.2
compilerKind: ghc
compilerVersion: 9.8.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.6.4
- compiler: ghc-9.6.5
compilerKind: ghc
compilerVersion: 9.6.4
compilerVersion: 9.6.5
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.8
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/mac-win-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ jobs:
matrix:
os: [macOS-latest, windows-latest]
ghc:
- '8.10'
- '9.0'
- '9.2'
- '9.4'
- '9.6'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ tags
cabal.sandbox.config
.ghc.environment.*
/dist-newstyle/
/stack*.yaml.lock
2 changes: 1 addition & 1 deletion shelly.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Build-type: Simple
tested-with:
GHC == 9.10.0
GHC == 9.8.2
GHC == 9.6.4
GHC == 9.6.5
GHC == 9.4.8
GHC == 9.2.8
GHC == 9.0.2
Expand Down

0 comments on commit 0acc633

Please sign in to comment.