Skip to content

Commit d012da5

Browse files
committed
CI: fix macOS-latest jobs
Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>
1 parent c9c554c commit d012da5

1 file changed

Lines changed: 25 additions & 16 deletions

File tree

.github/workflows/test.yml

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,14 @@ jobs:
4646
dmd-master,
4747
]
4848
include:
49-
# Needs >=dmd-2.107.1 due to https://issues.dlang.org/show_bug.cgi?id=24137
50-
- { os: macOS-latest, dc: dmd-2.108.1-rc.1 }
51-
- { os: macOS-latest, dc: dmd-2.109 }
52-
- { os: macOS-latest, dc: dmd-latest }
49+
# https://github.com/dlang/dmd/issues/21126
50+
- { os: macOS-latest, dc: dmd-beta }
5351
- { os: macOS-latest, dc: dmd-master }
52+
# Needs >=dmd-2.107.1 due to https://issues.dlang.org/show_bug.cgi?id=24137
53+
- { os: macOS-14, dc: dmd-2.108.1-rc.1 }
54+
- { os: macOS-14, dc: dmd-2.109 }
55+
- { os: macOS-14, dc: dmd-latest }
56+
- { os: macOS-14, dc: dmd-master }
5457
- { os: macOS-13, dc: dmd-2.108.1-rc.1 }
5558
- { os: macOS-13, dc: dmd-2.107 }
5659
- { os: macOS-13, dc: dmd-latest }
@@ -68,10 +71,9 @@ jobs:
6871
max-parallel: 5
6972
fail-fast: false
7073
matrix:
71-
os: [ ubuntu-latest, windows-latest, macOS-latest, macOS-13 ]
74+
os: [ ubuntu-latest, windows-latest, macOS-14, macOS-13 ]
7275
dc: [
7376
ldc,
74-
ldc-1.19.0,
7577
ldc-1.37.0-beta1,
7678
ldc-1.36,
7779
ldc-1.38b,
@@ -80,9 +82,14 @@ jobs:
8082
ldc^3,
8183
ldc-master,
8284
]
83-
exclude:
85+
include:
8486
# arm64 binaries are available since ldc-1.25.0
85-
- { os: macOS-latest, dc: ldc-1.19.0 }
87+
- { os: macOS-13, dc: ldc-1.19.0 }
88+
89+
- { os: macOS-latest, dc: ldc }
90+
- { os: macOS-latest, dc: ldc-beta }
91+
- { os: macOS-latest, dc: ldc-master }
92+
- { os: macOS-latest, dc: ldc-1.41.0 }
8693
runs-on: ${{ matrix.os }}
8794
steps:
8895
- uses: actions/checkout@v4
@@ -143,19 +150,21 @@ jobs:
143150
strategy:
144151
fail-fast: false
145152
matrix:
146-
os: [ ubuntu-latest, windows-latest, macos-latest, macOS-13 ]
153+
os: [ ubuntu-latest, windows-latest, macOS-14, macOS-13 ]
147154
dc: [ ldc-latest, dmd-latest, gdc, gdc-12 ]
148155
dub: [ 1.19.0, any, latest ]
156+
include:
157+
- { os: ubuntu-latest, dub: 1.19.0, dc: gdc }
158+
- { os: ubuntu-latest, dub: any, dc: gdc-12 }
159+
- { os: ubuntu-latest, dub: latest, dc: gdc }
160+
- { os: ubuntu-latest, dub: latest, dc: gdc-12 }
161+
162+
- { os: macos-latest, dub: any, dc: dmd-master }
163+
- { os: macos-latest, dub: latest, dc: ldc }
164+
- { os: macos-latest, dub: 1.40.0, dc: ldc-beta }
149165
exclude:
150166
# Excluded because those are actually Linux executables
151167
- { os: windows-latest, dub: 1.19.0 }
152-
# gdc only supports Linux
153-
- { os: windows-latest, dc: gdc }
154-
- { os: windows-latest, dc: gdc-12 }
155-
- { os: macOS-13, dc: gdc }
156-
- { os: macOS-13, dc: gdc-12 }
157-
- { os: macOS-latest, dc: gdc }
158-
- { os: macOS-latest, dc: gdc-12 }
159168
runs-on: ${{ matrix.os }}
160169
steps:
161170
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)