Skip to content

Commit 825a15d

Browse files
pazonerowlandgeoff
andauthored
[CI] MacOS 15 testing (#5919)
* [CI] MacOS 15 testing * test * test * test * MacOS Group * MacOS Group * Updated x86 image * Test ARM * new arm image * test macos 15 x86_64 * cleanup * cleanup * cleanup * improved branches config * Apply review changes * Apply suggestions from code review Co-authored-by: Geoff Rowland <[email protected]> --------- Co-authored-by: Geoff Rowland <[email protected]>
1 parent 574ec32 commit 825a15d

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.buildkite/pipeline.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ steps:
1313
retry:
1414
manual:
1515
allowed: true
16+
1617
- group: "Unit tests"
1718
key: "unit-tests"
1819
steps:
@@ -88,26 +89,27 @@ steps:
8889
manual:
8990
allowed: true
9091

91-
# Runs inly on the main branch
92-
- label: "Unit tests - MacOS 13 ARM"
93-
key: "unit-tests-macos-13-arm"
92+
- group: "macOS tests"
93+
key: "macos-unit-tests"
94+
steps:
95+
- label: "Unit tests - macOS 15 ARM"
9496
command: ".buildkite/scripts/steps/unit-tests.sh"
95-
branches: main
9697
artifact_paths:
9798
- "build/TEST-*.html"
9899
- "build/TEST-*.xml"
99100
- "build/diagnostics/*"
100101
- "coverage-*.out"
101102
agents:
102103
provider: orka
103-
imagePrefix: generic-13-ventura-arm
104+
imagePrefix: generic-base-15-arm-002
104105
retry:
105106
manual:
106107
allowed: true
107108

108-
- label: "Unit tests - MacOS 13"
109-
key: "unit-tests-macos-13"
109+
# Runs only on main and release branches
110+
- label: "Unit tests - macOS 13"
110111
command: ".buildkite/scripts/steps/unit-tests.sh"
112+
branches: "main 8.* 9.*"
111113
artifact_paths:
112114
- "build/TEST-*.html"
113115
- "build/TEST-*.xml"
@@ -178,9 +180,7 @@ steps:
178180
allow_failure: true
179181
- step: "unit-tests-win2016"
180182
allow_failure: true
181-
- step: "unit-tests-macos-13-arm"
182-
allow_failure: true
183-
- step: "unit-tests-macos-13"
183+
- step: "macos-unit-tests"
184184
allow_failure: true
185185
- step: "unit-tests-win10"
186186
allow_failure: true

0 commit comments

Comments
 (0)