Skip to content

Commit e2b5ebc

Browse files
committed
Merge branch 'ci5'
2 parents 22ebfe2 + 6b403bf commit e2b5ebc

File tree

1 file changed

+13
-27
lines changed

1 file changed

+13
-27
lines changed

Diff for: .github/workflows/test.yaml

+13-27
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,15 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
os: [ubuntu-latest]
17-
ghc: ['8.8', '8.10', '9.0', '9.2', '9.4', '9.6', '9.8', '9.10']
16+
os: [ubuntu-latest, macOS-13, windows-latest]
17+
ghc: ['9.4', '9.6', '9.8', '9.10', '9.12']
1818
include:
19-
- os: macOS-13
20-
ghc: '9.4'
21-
- os: macOS-13
22-
ghc: '9.6'
23-
- os: windows-latest
24-
ghc: '9.4'
25-
- os: windows-latest
26-
ghc: '9.6'
27-
- os: windows-latest
28-
ghc: '9.8'
19+
- os: ubuntu-latest
20+
ghc: '8.10'
21+
- os: ubuntu-latest
22+
ghc: '9.0'
23+
- os: ubuntu-latest
24+
ghc: '9.2'
2925
steps:
3026
- uses: actions/checkout@v4
3127

@@ -94,20 +90,14 @@ jobs:
9490
args: sh -c "cabal update && ghcup install ghc --isolate=/usr --force 9.2.2 && cabal test -w ghc-9.2.2"
9591

9692
darwin_arm:
97-
runs-on: ${{ matrix.os }}
93+
runs-on: [self-hosted, macOS, ARM64]
9894
env:
9995
MACOSX_DEPLOYMENT_TARGET: 10.13
10096
HOMEBREW_CHANGE_ARCH_TO_ARM: 1
10197
strategy:
102-
fail-fast: false
98+
fail-fast: true
10399
matrix:
104-
include:
105-
- os: [self-hosted, macOS, ARM64]
106-
ghc: 8.10.7
107-
- os: [self-hosted, macOS, ARM64]
108-
ghc: 9.2.8
109-
- os: [self-hosted, macOS, ARM64]
110-
ghc: 9.4.7
100+
ghc: ['recommended', 'latest']
111101
steps:
112102
- name: Checkout code
113103
uses: actions/checkout@v4
@@ -133,15 +123,11 @@ jobs:
133123
cabal test
134124
135125
freebsd:
136-
runs-on: ${{ matrix.os }}
126+
runs-on: [self-hosted, FreeBSD, X64]
137127
strategy:
138128
fail-fast: false
139129
matrix:
140-
include:
141-
- os: [self-hosted, FreeBSD, X64]
142-
ghc: 9.4.8
143-
- os: [self-hosted, FreeBSD, X64]
144-
ghc: 9.6.4
130+
ghc: ['recommended', 'latest']
145131
steps:
146132
- name: Checkout code
147133
uses: actions/checkout@v4

0 commit comments

Comments
 (0)