@@ -88,111 +88,111 @@ auto:
8888 # Linux/Docker builders #
8989 # ############################
9090
91- - name : aarch64-gnu
91+ - image : aarch64-gnu
9292 << : *job-aarch64-linux
9393
94- - name : arm-android
94+ - image : arm-android
9595 << : *job-linux-8c
9696
97- - name : armhf-gnu
97+ - image : armhf-gnu
9898 << : *job-linux-8c
9999
100- - name : dist-aarch64-linux
100+ - image : dist-aarch64-linux
101101 env :
102102 CODEGEN_BACKENDS : llvm,cranelift
103103 << : *job-linux-8c
104104
105- - name : dist-android
105+ - image : dist-android
106106 << : *job-linux-8c
107107
108- - name : dist-arm-linux
108+ - image : dist-arm-linux
109109 << : *job-linux-16c
110110
111- - name : dist-armhf-linux
111+ - image : dist-armhf-linux
112112 << : *job-linux-8c
113113
114- - name : dist-armv7-linux
114+ - image : dist-armv7-linux
115115 << : *job-linux-8c
116116
117- - name : dist-i586-gnu-i586-i686-musl
117+ - image : dist-i586-gnu-i586-i686-musl
118118 << : *job-linux-8c
119119
120- - name : dist-i686-linux
120+ - image : dist-i686-linux
121121 << : *job-linux-8c
122122
123- - name : dist-loongarch64-linux
123+ - image : dist-loongarch64-linux
124124 << : *job-linux-8c
125125
126- - name : dist-ohos
126+ - image : dist-ohos
127127 << : *job-linux-8c
128128
129- - name : dist-powerpc-linux
129+ - image : dist-powerpc-linux
130130 << : *job-linux-8c
131131
132- - name : dist-powerpc64-linux
132+ - image : dist-powerpc64-linux
133133 << : *job-linux-8c
134134
135- - name : dist-powerpc64le-linux
135+ - image : dist-powerpc64le-linux
136136 << : *job-linux-8c
137137
138- - name : dist-riscv64-linux
138+ - image : dist-riscv64-linux
139139 << : *job-linux-8c
140140
141- - name : dist-s390x-linux
141+ - image : dist-s390x-linux
142142 << : *job-linux-8c
143143
144- - name : dist-various-1
144+ - image : dist-various-1
145145 << : *job-linux-8c
146146
147- - name : dist-various-2
147+ - image : dist-various-2
148148 << : *job-linux-8c
149149
150- - name : dist-x86_64-freebsd
150+ - image : dist-x86_64-freebsd
151151 << : *job-linux-8c
152152
153- - name : dist-x86_64-illumos
153+ - image : dist-x86_64-illumos
154154 << : *job-linux-8c
155155
156- - name : dist-x86_64-linux
156+ - image : dist-x86_64-linux
157157 env :
158158 CODEGEN_BACKENDS : llvm,cranelift
159159 << : *job-linux-16c
160160
161- - name : dist-x86_64-linux-alt
161+ - image : dist-x86_64-linux-alt
162162 env :
163163 IMAGE : dist-x86_64-linux
164164 CODEGEN_BACKENDS : llvm,cranelift
165165 << : *job-linux-16c
166166
167- - name : dist-x86_64-musl
167+ - image : dist-x86_64-musl
168168 env :
169169 CODEGEN_BACKENDS : llvm,cranelift
170170 << : *job-linux-8c
171171
172- - name : dist-x86_64-netbsd
172+ - image : dist-x86_64-netbsd
173173 << : *job-linux-8c
174174
175- - name : i686-gnu
175+ - image : i686-gnu
176176 << : *job-linux-8c
177177
178- - name : i686-gnu-nopt
178+ - image : i686-gnu-nopt
179179 << : *job-linux-8c
180180
181- - name : mingw-check
181+ - image : mingw-check
182182 << : *job-linux-4c
183183
184- - name : test-various
184+ - image : test-various
185185 << : *job-linux-8c
186186
187- - name : x86_64-gnu
187+ - image : x86_64-gnu
188188 << : *job-linux-4c
189189
190190 # This job ensures commits landing on nightly still pass the full
191191 # test suite on the stable channel. There are some UI tests that
192192 # depend on the channel being built (for example if they include the
193193 # channel name on the output), and this builder prevents landing
194194 # changes that would result in broken builds after a promotion.
195- - name : x86_64-gnu-stable
195+ - image : x86_64-gnu-stable
196196 env :
197197 IMAGE : x86_64-gnu
198198 RUST_CI_OVERRIDE_RELEASE_CHANNEL : stable
@@ -202,37 +202,37 @@ auto:
202202 CI_ONLY_WHEN_CHANNEL : nightly
203203 << : *job-linux-4c
204204
205- - name : x86_64-gnu-aux
205+ - image : x86_64-gnu-aux
206206 << : *job-linux-4c
207207
208- - name : x86_64-gnu-integration
208+ - image : x86_64-gnu-integration
209209 env :
210210 # Only run this job on the nightly channel. Fuchsia requires
211211 # nightly features to compile, and this job would fail if
212212 # executed on beta and stable.
213213 CI_ONLY_WHEN_CHANNEL : nightly
214214 << : *job-linux-8c
215215
216- - name : x86_64-gnu-debug
216+ - image : x86_64-gnu-debug
217217 << : *job-linux-8c
218218
219- - name : x86_64-gnu-distcheck
219+ - image : x86_64-gnu-distcheck
220220 << : *job-linux-8c
221221
222- - name : x86_64-gnu-llvm-18
222+ - image : x86_64-gnu-llvm-18
223223 env :
224224 RUST_BACKTRACE : 1
225225 << : *job-linux-8c
226226
227- - name : x86_64-gnu-llvm-17
227+ - image : x86_64-gnu-llvm-17
228228 env :
229229 RUST_BACKTRACE : 1
230230 << : *job-linux-8c
231231
232- - name : x86_64-gnu-nopt
232+ - image : x86_64-gnu-nopt
233233 << : *job-linux-4c
234234
235- - name : x86_64-gnu-tools
235+ - image : x86_64-gnu-tools
236236 env :
237237 DEPLOY_TOOLSTATES_JSON : toolstates-linux.json
238238 << : *job-linux-8c
@@ -241,7 +241,7 @@ auto:
241241 # macOS Builders #
242242 # ###################
243243
244- - name : dist-x86_64-apple
244+ - image : dist-x86_64-apple
245245 env :
246246 SCRIPT : ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
247247 RUST_CONFIGURE_ARGS : --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
@@ -255,7 +255,7 @@ auto:
255255 CODEGEN_BACKENDS : llvm,cranelift
256256 << : *job-macos-xl
257257
258- - name : dist-apple-various
258+ - image : dist-apple-various
259259 env :
260260 SCRIPT : ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
261261 RUST_CONFIGURE_ARGS : --enable-sanitizers --enable-profiler --set rust.jemalloc
@@ -267,7 +267,7 @@ auto:
267267 NO_OVERFLOW_CHECKS : 1
268268 << : *job-macos-xl
269269
270- - name : x86_64-apple-1
270+ - image : x86_64-apple-1
271271 env : &env-x86_64-apple-tests
272272 SCRIPT : ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
273273 RUST_CONFIGURE_ARGS : --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
@@ -280,14 +280,14 @@ auto:
280280 NO_OVERFLOW_CHECKS : 1
281281 << : *job-macos-xl
282282
283- - name : x86_64-apple-2
283+ - image : x86_64-apple-2
284284 env :
285285 SCRIPT : ./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps
286286 << : *env-x86_64-apple-tests
287287 << : *job-macos-xl
288288
289289 # This target only needs to support 11.0 and up as nothing else supports the hardware
290- - name : dist-aarch64-apple
290+ - image : dist-aarch64-apple
291291 env :
292292 SCRIPT : ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
293293 RUST_CONFIGURE_ARGS : >-
@@ -309,7 +309,7 @@ auto:
309309 << : *job-macos-m1
310310
311311 # This target only needs to support 11.0 and up as nothing else supports the hardware
312- - name : aarch64-apple
312+ - image : aarch64-apple
313313 env :
314314 SCRIPT : ./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin
315315 RUST_CONFIGURE_ARGS : >-
@@ -330,19 +330,19 @@ auto:
330330 # Windows Builders #
331331 # #####################
332332
333- - name : x86_64-msvc
333+ - image : x86_64-msvc
334334 env :
335335 RUST_CONFIGURE_ARGS : --build=x86_64-pc-windows-msvc --enable-profiler
336336 SCRIPT : make ci-msvc
337337 << : *job-windows-8c
338338
339- - name : i686-msvc
339+ - image : i686-msvc
340340 env :
341341 RUST_CONFIGURE_ARGS : --build=i686-pc-windows-msvc
342342 SCRIPT : make ci-msvc
343343 << : *job-windows-8c
344344
345- - name : x86_64-msvc-ext
345+ - image : x86_64-msvc-ext
346346 env :
347347 SCRIPT : python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
348348 HOST_TARGET : x86_64-pc-windows-msvc
@@ -366,7 +366,7 @@ auto:
366366 # came from the mingw-w64 SourceForge download site. Unfortunately
367367 # SourceForge is notoriously flaky, so we mirror it on our own infrastructure.
368368
369- - name : i686-mingw
369+ - image : i686-mingw
370370 env :
371371 RUST_CONFIGURE_ARGS : --build=i686-pc-windows-gnu
372372 SCRIPT : make ci-mingw
@@ -376,7 +376,7 @@ auto:
376376 CUSTOM_MINGW : 1
377377 << : *job-windows-8c
378378
379- - name : x86_64-mingw
379+ - image : x86_64-mingw
380380 env :
381381 SCRIPT : make ci-mingw
382382 RUST_CONFIGURE_ARGS : >-
@@ -388,7 +388,7 @@ auto:
388388 CUSTOM_MINGW : 1
389389 << : *job-windows-8c
390390
391- - name : dist-x86_64-msvc
391+ - image : dist-x86_64-msvc
392392 env :
393393 RUST_CONFIGURE_ARGS : >-
394394 --build=x86_64-pc-windows-msvc
@@ -401,7 +401,7 @@ auto:
401401 DIST_REQUIRE_ALL_TOOLS : 1
402402 << : *job-windows-8c
403403
404- - name : dist-i686-msvc
404+ - image : dist-i686-msvc
405405 env :
406406 RUST_CONFIGURE_ARGS : >-
407407 --build=i686-pc-windows-msvc
@@ -413,7 +413,7 @@ auto:
413413 DIST_REQUIRE_ALL_TOOLS : 1
414414 << : *job-windows-8c
415415
416- - name : dist-aarch64-msvc
416+ - image : dist-aarch64-msvc
417417 env :
418418 RUST_CONFIGURE_ARGS : >-
419419 --build=x86_64-pc-windows-msvc
@@ -424,7 +424,7 @@ auto:
424424 DIST_REQUIRE_ALL_TOOLS : 1
425425 << : *job-windows-8c
426426
427- - name : dist-i686-mingw
427+ - image : dist-i686-mingw
428428 env :
429429 RUST_CONFIGURE_ARGS : >-
430430 --build=i686-pc-windows-gnu
@@ -438,7 +438,7 @@ auto:
438438 DIST_REQUIRE_ALL_TOOLS : 1
439439 << : *job-windows-8c
440440
441- - name : dist-x86_64-mingw
441+ - image : dist-x86_64-mingw
442442 env :
443443 SCRIPT : python x.py dist bootstrap --include-default-paths
444444 RUST_CONFIGURE_ARGS : >-
@@ -452,7 +452,7 @@ auto:
452452 DIST_REQUIRE_ALL_TOOLS : 1
453453 << : *job-windows-8c
454454
455- - name : dist-x86_64-msvc-alt
455+ - image : dist-x86_64-msvc-alt
456456 env :
457457 RUST_CONFIGURE_ARGS : --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
458458 SCRIPT : python x.py dist bootstrap --include-default-paths
0 commit comments