Skip to content

Commit a7b1e2b

Browse files
committed
CI: fix macOS-latest jobs
Signed-off-by: Andrei Horodniceanu <[email protected]>
1 parent c9c554c commit a7b1e2b

File tree

1 file changed

+25
-17
lines changed

1 file changed

+25
-17
lines changed

.github/workflows/test.yml

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,13 @@ 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
5350
- { os: macOS-latest, dc: dmd-master }
51+
# Needs >=dmd-2.107.1 due to https://issues.dlang.org/show_bug.cgi?id=24137
52+
- { os: macOS-14, dc: dmd-2.108.1-rc.1 }
53+
- { os: macOS-14, dc: dmd-2.109 }
54+
- { os: macOS-14, dc: dmd-latest }
55+
- { os: macOS-14, dc: dmd-master }
5456
- { os: macOS-13, dc: dmd-2.108.1-rc.1 }
5557
- { os: macOS-13, dc: dmd-2.107 }
5658
- { os: macOS-13, dc: dmd-latest }
@@ -68,10 +70,9 @@ jobs:
6870
max-parallel: 5
6971
fail-fast: false
7072
matrix:
71-
os: [ ubuntu-latest, windows-latest, macOS-latest, macOS-13 ]
73+
os: [ ubuntu-latest, windows-latest, macOS-14, macOS-13 ]
7274
dc: [
7375
ldc,
74-
ldc-1.19.0,
7576
ldc-1.37.0-beta1,
7677
ldc-1.36,
7778
ldc-1.38b,
@@ -80,9 +81,14 @@ jobs:
8081
ldc^3,
8182
ldc-master,
8283
]
83-
exclude:
84+
include:
8485
# arm64 binaries are available since ldc-1.25.0
85-
- { os: macOS-latest, dc: ldc-1.19.0 }
86+
- { os: macOS-13, dc: ldc-1.19.0 }
87+
88+
- { os: macOS-latest, dc: ldc }
89+
- { os: macOS-latest, dc: ldc-beta }
90+
- { os: macOS-latest, dc: ldc-master }
91+
- { os: macOS-latest, dc: ldc-1.41.0 }
8692
runs-on: ${{ matrix.os }}
8793
steps:
8894
- uses: actions/checkout@v4
@@ -143,19 +149,21 @@ jobs:
143149
strategy:
144150
fail-fast: false
145151
matrix:
146-
os: [ ubuntu-latest, windows-latest, macos-latest, macOS-13 ]
147-
dc: [ ldc-latest, dmd-latest, gdc, gdc-12 ]
152+
os: [ ubuntu-latest, windows-latest, macOS-14, macOS-13 ]
153+
dc: [ ldc-latest, dmd-latest ]
148154
dub: [ 1.19.0, any, latest ]
155+
include:
156+
- { os: ubuntu-latest, dub: 1.19.0, dc: gdc }
157+
- { os: ubuntu-latest, dub: any, dc: gdc-12 }
158+
- { os: ubuntu-latest, dub: latest, dc: gdc }
159+
- { os: ubuntu-latest, dub: latest, dc: gdc-12 }
160+
161+
- { os: macos-latest, dub: any, dc: dmd-master }
162+
- { os: macos-latest, dub: latest, dc: ldc }
163+
- { os: macos-latest, dub: 1.40.0, dc: ldc-beta }
149164
exclude:
150165
# Excluded because those are actually Linux executables
151166
- { 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 }
159167
runs-on: ${{ matrix.os }}
160168
steps:
161169
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)