Skip to content

Commit 4bd32cc

Browse files
authored
[libc++] Remove anchors for agent queues from the BuildKite pipeline configuration (#75359)
We didn't save that much boilerplate with those anchors, but it made the pipeline description harder to understand because the definition of the jobs and the agents they run on were so far apart. Anchors are useful for the other common boilerplate we truly share between all jobs, but it seems reasonable to define agent queues in-line.
1 parent f42b930 commit 4bd32cc

File tree

1 file changed

+79
-66
lines changed

1 file changed

+79
-66
lines changed

libcxx/utils/ci/buildkite-pipeline.yml

Lines changed: 79 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -41,45 +41,6 @@ definitions:
4141
- "**/*.abilist"
4242
- "**/crash_diagnostics/*"
4343

44-
# Define agents using YAML anchors to reduce duplication
45-
agents_definitions:
46-
_windows_agent: &windows_agent
47-
agents:
48-
queue: windows
49-
50-
# Mac OS Builders
51-
_mac_agent_x86: &mac_agent_x86
52-
agents:
53-
queue: libcxx-builders
54-
os: macos
55-
arch: x86_64
56-
_mac_agent_arm64: &mac_agent_arm64
57-
agents:
58-
queue: libcxx-builders
59-
os: macos
60-
arch: arm64
61-
_mac_agent_any_arch: &mac_agent_any_arch
62-
agents:
63-
queue: libcxx-builders
64-
os: macos
65-
_arm_agent_aarch64: &arm_agent_aarch64
66-
agents:
67-
queue: libcxx-builders-linaro-arm
68-
arch: aarch64
69-
_arm_agent_armv8l: &arm_agent_armv8l
70-
agents:
71-
queue: libcxx-builders-linaro-arm
72-
arch: armv8l
73-
_aix_agent: &aix_agent
74-
agents:
75-
queue: libcxx-builders
76-
os: aix
77-
_android_agent: &android_agent
78-
agents:
79-
queue: libcxx-builders
80-
os: android
81-
82-
8344
environment_definitions:
8445
_common_env: &common_env
8546
ENABLE_CLANG_TIDY: "On"
@@ -101,122 +62,166 @@ steps:
10162
steps:
10263
- label: Clang-cl (DLL)
10364
command: bash libcxx/utils/ci/run-buildbot clang-cl-dll
104-
<<: *windows_agent
65+
agents:
66+
queue: windows
10567
<<: *common
10668

10769
- label: Clang-cl (Static)
10870
command: bash libcxx/utils/ci/run-buildbot clang-cl-static
109-
<<: *windows_agent
71+
agents:
72+
queue: windows
11073
<<: *common
11174

11275
- label: Clang-cl (no vcruntime exceptions)
11376
command: bash libcxx/utils/ci/run-buildbot clang-cl-no-vcruntime
11477
<<: *common
115-
<<: *windows_agent
78+
agents:
79+
queue: windows
11680

11781
- label: Clang-cl (Debug mode)
11882
command: bash libcxx/utils/ci/run-buildbot clang-cl-debug
119-
<<: *windows_agent
83+
agents:
84+
queue: windows
12085
<<: *common
12186

12287
- label: Clang-cl (Static CRT)
12388
command: bash libcxx/utils/ci/run-buildbot clang-cl-static-crt
124-
<<: *windows_agent
89+
agents:
90+
queue: windows
12591
<<: *common
12692

12793
- label: MinGW (DLL, x86_64)
12894
command: bash libcxx/utils/ci/run-buildbot mingw-dll
129-
<<: *windows_agent
95+
agents:
96+
queue: windows
13097
<<: *common
13198

13299
- label: MinGW (Static, x86_64)
133100
command: bash libcxx/utils/ci/run-buildbot mingw-static
134-
<<: *windows_agent
101+
agents:
102+
queue: windows
135103
<<: *common
136104

137105
- label: MinGW (DLL, i686)
138106
command: bash libcxx/utils/ci/run-buildbot mingw-dll-i686
139-
<<: *windows_agent
107+
agents:
108+
queue: windows
140109
<<: *common
141110

142111
- group: ':mac: Apple'
143112
steps:
144113
- label: MacOS x86_64
145114
command: libcxx/utils/ci/run-buildbot generic-cxx23
146-
<<: *mac_agent_x86
115+
agents:
116+
queue: libcxx-builders
117+
os: macos
118+
arch: x86_64
147119
<<: *common
148120

149121
- label: MacOS arm64
150122
command: libcxx/utils/ci/run-buildbot generic-cxx23
151-
<<: *mac_agent_arm64
123+
agents:
124+
queue: libcxx-builders
125+
os: macos
126+
arch: arm64
152127
<<: *common
153128

154129
- label: MacOS with Modules
155130
command: libcxx/utils/ci/run-buildbot generic-modules
156-
<<: *mac_agent_any_arch
131+
agents:
132+
queue: libcxx-builders
133+
os: macos
157134
<<: *common
158135

159136
- label: MacOS with C++03
160137
command: libcxx/utils/ci/run-buildbot generic-cxx03
161-
<<: *mac_agent_any_arch
138+
agents:
139+
queue: libcxx-builders
140+
os: macos
162141
<<: *common
163142

164143
# Build with the configuration we use to generate libc++.dylib on Apple platforms
165144
- label: Apple system
166145
command: libcxx/utils/ci/run-buildbot apple-system
167-
<<: *mac_agent_arm64 # This can technically run on any architecture, but we have more resources on arm64 so we pin this job to arm64
146+
agents:
147+
queue: libcxx-builders
148+
os: macos
149+
arch: arm64 # This can technically run on any architecture, but we have more resources on arm64 so we pin this job to arm64
168150
<<: *common
169151

170152
- label: Apple back-deployment macosx10.13
171153
command: libcxx/utils/ci/run-buildbot apple-system-backdeployment-10.13
172-
<<: *mac_agent_x86 # We need to use x86_64 for back-deployment CI on this target since macOS didn't support arm64 back then
154+
agents:
155+
queue: libcxx-builders
156+
os: macos
157+
arch: x86_64 # We need to use x86_64 for back-deployment CI on this target since macOS didn't support arm64 back then
173158
<<: *common
174159

175160
- label: Apple back-deployment macosx10.15
176161
command: libcxx/utils/ci/run-buildbot apple-system-backdeployment-10.15
177-
<<: *mac_agent_x86 # We need to use x86_64 for back-deployment CI on this target since macOS didn't support arm64 back then
162+
agents:
163+
queue: libcxx-builders
164+
os: macos
165+
arch: x86_64 # We need to use x86_64 for back-deployment CI on this target since macOS didn't support arm64 back then
178166
<<: *common
179167

180168
- label: Apple back-deployment with hardening enabled
181169
command: libcxx/utils/ci/run-buildbot apple-system-backdeployment-hardened-11.0
182-
<<: *mac_agent_x86 # TODO: Remove this once we are able to run back-deployment on arm64 again, since this isn't x86_64 specific
170+
agents:
171+
queue: libcxx-builders
172+
os: macos
173+
arch: x86_64 # TODO: Remove this once we are able to run back-deployment on arm64 again, since this isn't x86_64 specific
183174
<<: *common
184175

185176
- group: ARM
186177
steps:
187178
- label: AArch64
188179
command: libcxx/utils/ci/run-buildbot aarch64
189-
<<: *arm_agent_aarch64
180+
agents:
181+
queue: libcxx-builders-linaro-arm
182+
arch: aarch64
190183
<<: *common
191184

192185
- label: AArch64 -fno-exceptions
193186
command: libcxx/utils/ci/run-buildbot aarch64-no-exceptions
194-
<<: *arm_agent_aarch64
187+
agents:
188+
queue: libcxx-builders-linaro-arm
189+
arch: aarch64
195190
<<: *common
196191

197192
- label: Armv8
198193
command: libcxx/utils/ci/run-buildbot armv8
199-
<<: *arm_agent_armv8l
194+
agents:
195+
queue: libcxx-builders-linaro-arm
196+
arch: armv8l
200197
<<: *common
201198

202199
- label: Armv8 -fno-exceptions
203200
command: libcxx/utils/ci/run-buildbot armv8-no-exceptions
204-
<<: *arm_agent_armv8l
201+
agents:
202+
queue: libcxx-builders-linaro-arm
203+
arch: armv8l
205204
<<: *common
206205

207206
- label: Armv7
208207
command: libcxx/utils/ci/run-buildbot armv7
209-
<<: *arm_agent_armv8l
208+
agents:
209+
queue: libcxx-builders-linaro-arm
210+
arch: armv8l
210211
<<: *common
211212

212213
- label: Armv7 -fno-exceptions
213214
command: libcxx/utils/ci/run-buildbot armv7-no-exceptions
214-
<<: *arm_agent_armv8l
215+
agents:
216+
queue: libcxx-builders-linaro-arm
217+
arch: armv8l
215218
<<: *common
216219

217220
- label: Armv7-M picolibc
218221
command: libcxx/utils/ci/run-buildbot armv7m-picolibc
219-
<<: *arm_agent_aarch64
222+
agents:
223+
queue: libcxx-builders-linaro-arm
224+
arch: aarch64
220225
<<: *common
221226

222227
- group: AIX
@@ -227,7 +232,9 @@ steps:
227232
CC: clang
228233
CXX: clang++
229234
OBJECT_MODE: '32'
230-
<<: *aix_agent
235+
agents:
236+
queue: libcxx-builders
237+
os: aix
231238
<<: *common
232239

233240
- label: AIX (64-bit)
@@ -236,7 +243,9 @@ steps:
236243
CC: clang
237244
CXX: clang++
238245
OBJECT_MODE: '64'
239-
<<: *aix_agent
246+
agents:
247+
queue: libcxx-builders
248+
os: aix
240249
<<: *common
241250

242251
- group: ':freebsd: FreeBSD'
@@ -256,12 +265,16 @@ steps:
256265
steps:
257266
- label: Android 5.0, x86 NDK
258267
command: libcxx/utils/ci/run-buildbot android-ndk-21-def-x86
259-
<<: *android_agent
268+
agents:
269+
queue: libcxx-builders
270+
os: android
260271
<<: *common
261272

262273
- label: Android 13, x86_64 NDK
263274
command: libcxx/utils/ci/run-buildbot android-ndk-33-goog-x86_64
264-
<<: *android_agent
275+
agents:
276+
queue: libcxx-builders
277+
os: android
265278
<<: *common
266279

267280

0 commit comments

Comments
 (0)