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

Bump CI to macos-14 runner #102

Merged
merged 3 commits into from
May 3, 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
8 changes: 3 additions & 5 deletions .github/workflows/cabal-mac-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ on:
push:
branches:
- master
- ci-*
pull_request:
branches:
- master
- ci-*

jobs:

Expand All @@ -18,10 +16,10 @@ jobs:
matrix:
os: [macOS-latest, windows-latest]
ghc:
- 9.0.2
- 9.2.8
- 9.4.7
- 9.6.2
- 9.4.8
- 9.6.5
- 9.8.2
fail-fast: false

steps:
Expand Down
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.20240403
# version: 0.19.20240429
#
# REGENDATA ("0.19.20240403",["github","text-icu.cabal"])
# REGENDATA ("0.19.20240429",["github","text-icu.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.20240328
- compiler: ghc-9.10.0.20240426
compilerKind: ghc
compilerVersion: 9.10.0.20240328
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
9 changes: 7 additions & 2 deletions .github/workflows/stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ defaults:

jobs:
stack:
name: ${{ matrix.os }} Stack ${{ matrix.plan.resolver }} / ${{ matrix.plan.ghc }}
name: ${{ matrix.os }} Stack ${{ matrix.plan.resolver }}
strategy:
fail-fast: false
matrix:
Expand All @@ -33,6 +33,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: haskell-actions/setup@v2
with:
enable-stack: true
stack-no-global: true

- name: Configure
run: |
$STACK init
Expand All @@ -53,7 +58,7 @@ jobs:
# echo "STACK_ROOT=${STACK_ROOT}" >> "${GITHUB_ENV}"

- name: Set up for the ICU library (macOS)
if: ${{ runner.os == 'macOS' }}
if: runner.os == 'macOS'
run: |
ICU4C=$(brew --prefix)/opt/icu4c
echo "PKG_CONFIG_PATH=${ICU4C}/lib/pkgconfig" >> "${GITHUB_ENV}"
Expand Down
2 changes: 1 addition & 1 deletion cabal.haskell-ci
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
branches: master

-- text-icu-0.8 requires a newer ICU lib (shipped not with Ubuntu 18.04, but with 20.04)
distribution: focal
-- distribution: focal

-- installed: +all -binary -bytestring -containers -deepseq -directory -time -unix

Expand Down
2 changes: 1 addition & 1 deletion text-icu.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ extra-source-files:
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
Loading