Skip to content

Commit 3153eaa

Browse files
Mark-SimulacrumMark-Simulacrum
committed
Trim down core counts for fast builders
These builders aren't particularly high on overall average CPU usage and finish in typically around 30 minutes. Cutting their core counts will hopefully not significantly increase wall-time while cutting costs, allowing us to shift some of the wins into our slower builders.
1 parent 53a4003 commit 3153eaa

File tree

2 files changed

+72
-72
lines changed

2 files changed

+72
-72
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -181,70 +181,70 @@ jobs:
181181
- ARM64
182182
- linux
183183
- name: arm-android
184-
os: ubuntu-20.04-16core-64gb
184+
os: ubuntu-20.04-8core-32gb
185185
env: {}
186186
- name: armhf-gnu
187-
os: ubuntu-20.04-16core-64gb
187+
os: ubuntu-20.04-8core-32gb
188188
env: {}
189189
- name: dist-aarch64-linux
190-
os: ubuntu-20.04-16core-64gb
190+
os: ubuntu-20.04-8core-32gb
191191
env: {}
192192
- name: dist-android
193-
os: ubuntu-20.04-16core-64gb
193+
os: ubuntu-20.04-8core-32gb
194194
env: {}
195195
- name: dist-arm-linux
196196
os: ubuntu-20.04-16core-64gb
197197
env: {}
198198
- name: dist-armhf-linux
199-
os: ubuntu-20.04-16core-64gb
199+
os: ubuntu-20.04-8core-32gb
200200
env: {}
201201
- name: dist-armv7-linux
202-
os: ubuntu-20.04-16core-64gb
202+
os: ubuntu-20.04-8core-32gb
203203
env: {}
204204
- name: dist-i586-gnu-i586-i686-musl
205-
os: ubuntu-20.04-16core-64gb
205+
os: ubuntu-20.04-8core-32gb
206206
env: {}
207207
- name: dist-i686-linux
208-
os: ubuntu-20.04-16core-64gb
208+
os: ubuntu-20.04-8core-32gb
209209
env: {}
210210
- name: dist-mips-linux
211-
os: ubuntu-20.04-16core-64gb
211+
os: ubuntu-20.04-8core-32gb
212212
env: {}
213213
- name: dist-mips64-linux
214-
os: ubuntu-20.04-16core-64gb
214+
os: ubuntu-20.04-8core-32gb
215215
env: {}
216216
- name: dist-mips64el-linux
217-
os: ubuntu-20.04-16core-64gb
217+
os: ubuntu-20.04-8core-32gb
218218
env: {}
219219
- name: dist-mipsel-linux
220-
os: ubuntu-20.04-16core-64gb
220+
os: ubuntu-20.04-8core-32gb
221221
env: {}
222222
- name: dist-powerpc-linux
223-
os: ubuntu-20.04-16core-64gb
223+
os: ubuntu-20.04-8core-32gb
224224
env: {}
225225
- name: dist-powerpc64-linux
226-
os: ubuntu-20.04-16core-64gb
226+
os: ubuntu-20.04-8core-32gb
227227
env: {}
228228
- name: dist-powerpc64le-linux
229-
os: ubuntu-20.04-16core-64gb
229+
os: ubuntu-20.04-8core-32gb
230230
env: {}
231231
- name: dist-riscv64-linux
232-
os: ubuntu-20.04-16core-64gb
232+
os: ubuntu-20.04-8core-32gb
233233
env: {}
234234
- name: dist-s390x-linux
235-
os: ubuntu-20.04-16core-64gb
235+
os: ubuntu-20.04-8core-32gb
236236
env: {}
237237
- name: dist-various-1
238-
os: ubuntu-20.04-16core-64gb
238+
os: ubuntu-20.04-8core-32gb
239239
env: {}
240240
- name: dist-various-2
241-
os: ubuntu-20.04-16core-64gb
241+
os: ubuntu-20.04-8core-32gb
242242
env: {}
243243
- name: dist-x86_64-freebsd
244-
os: ubuntu-20.04-16core-64gb
244+
os: ubuntu-20.04-8core-32gb
245245
env: {}
246246
- name: dist-x86_64-illumos
247-
os: ubuntu-20.04-16core-64gb
247+
os: ubuntu-20.04-8core-32gb
248248
env: {}
249249
- name: dist-x86_64-linux
250250
os: ubuntu-20.04-16core-64gb
@@ -254,10 +254,10 @@ jobs:
254254
IMAGE: dist-x86_64-linux
255255
os: ubuntu-20.04-16core-64gb
256256
- name: dist-x86_64-musl
257-
os: ubuntu-20.04-16core-64gb
257+
os: ubuntu-20.04-8core-32gb
258258
env: {}
259259
- name: dist-x86_64-netbsd
260-
os: ubuntu-20.04-16core-64gb
260+
os: ubuntu-20.04-8core-32gb
261261
env: {}
262262
- name: i686-gnu
263263
os: ubuntu-20.04-16core-64gb
@@ -266,51 +266,51 @@ jobs:
266266
os: ubuntu-20.04-16core-64gb
267267
env: {}
268268
- name: mingw-check
269-
os: ubuntu-20.04-16core-64gb
269+
os: ubuntu-20.04-8core-32gb
270270
env: {}
271271
- name: test-various
272-
os: ubuntu-20.04-16core-64gb
272+
os: ubuntu-20.04-8core-32gb
273273
env: {}
274274
- name: wasm32
275-
os: ubuntu-20.04-16core-64gb
275+
os: ubuntu-20.04-8core-32gb
276276
env: {}
277277
- name: x86_64-gnu
278-
os: ubuntu-20.04-16core-64gb
278+
os: ubuntu-20.04-8core-32gb
279279
env: {}
280280
- name: x86_64-gnu-stable
281281
env:
282282
IMAGE: x86_64-gnu
283283
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
284284
CI_ONLY_WHEN_CHANNEL: nightly
285-
os: ubuntu-20.04-16core-64gb
285+
os: ubuntu-20.04-8core-32gb
286286
- name: x86_64-gnu-aux
287-
os: ubuntu-20.04-16core-64gb
287+
os: ubuntu-20.04-8core-32gb
288288
env: {}
289289
- name: x86_64-gnu-debug
290-
os: ubuntu-20.04-16core-64gb
290+
os: ubuntu-20.04-8core-32gb
291291
env: {}
292292
- name: x86_64-gnu-distcheck
293-
os: ubuntu-20.04-16core-64gb
293+
os: ubuntu-20.04-8core-32gb
294294
env: {}
295295
- name: x86_64-gnu-llvm-15
296296
env:
297297
RUST_BACKTRACE: 1
298-
os: ubuntu-20.04-16core-64gb
298+
os: ubuntu-20.04-8core-32gb
299299
- name: x86_64-gnu-llvm-14
300300
env:
301301
RUST_BACKTRACE: 1
302-
os: ubuntu-20.04-16core-64gb
302+
os: ubuntu-20.04-8core-32gb
303303
- name: x86_64-gnu-llvm-14-stage1
304304
env:
305305
RUST_BACKTRACE: 1
306-
os: ubuntu-20.04-16core-64gb
306+
os: ubuntu-20.04-8core-32gb
307307
- name: x86_64-gnu-nopt
308-
os: ubuntu-20.04-16core-64gb
308+
os: ubuntu-20.04-8core-32gb
309309
env: {}
310310
- name: x86_64-gnu-tools
311311
env:
312312
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
313-
os: ubuntu-20.04-16core-64gb
313+
os: ubuntu-20.04-8core-32gb
314314
- name: dist-x86_64-apple
315315
env:
316316
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"

‎src/ci/github-actions/ci.yml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -335,70 +335,70 @@ jobs:
335335
<<: *job-aarch64-linux
336336

337337
- name: arm-android
338-
<<: *job-linux-16c
338+
<<: *job-linux-8c
339339

340340
- name: armhf-gnu
341-
<<: *job-linux-16c
341+
<<: *job-linux-8c
342342

343343
- name: dist-aarch64-linux
344-
<<: *job-linux-16c
344+
<<: *job-linux-8c
345345

346346
- name: dist-android
347-
<<: *job-linux-16c
347+
<<: *job-linux-8c
348348

349349
- name: dist-arm-linux
350350
<<: *job-linux-16c
351351

352352
- name: dist-armhf-linux
353-
<<: *job-linux-16c
353+
<<: *job-linux-8c
354354

355355
- name: dist-armv7-linux
356-
<<: *job-linux-16c
356+
<<: *job-linux-8c
357357

358358
- name: dist-i586-gnu-i586-i686-musl
359-
<<: *job-linux-16c
359+
<<: *job-linux-8c
360360

361361
- name: dist-i686-linux
362-
<<: *job-linux-16c
362+
<<: *job-linux-8c
363363

364364
- name: dist-mips-linux
365-
<<: *job-linux-16c
365+
<<: *job-linux-8c
366366

367367
- name: dist-mips64-linux
368-
<<: *job-linux-16c
368+
<<: *job-linux-8c
369369

370370
- name: dist-mips64el-linux
371-
<<: *job-linux-16c
371+
<<: *job-linux-8c
372372

373373
- name: dist-mipsel-linux
374-
<<: *job-linux-16c
374+
<<: *job-linux-8c
375375

376376
- name: dist-powerpc-linux
377-
<<: *job-linux-16c
377+
<<: *job-linux-8c
378378

379379
- name: dist-powerpc64-linux
380-
<<: *job-linux-16c
380+
<<: *job-linux-8c
381381

382382
- name: dist-powerpc64le-linux
383-
<<: *job-linux-16c
383+
<<: *job-linux-8c
384384

385385
- name: dist-riscv64-linux
386-
<<: *job-linux-16c
386+
<<: *job-linux-8c
387387

388388
- name: dist-s390x-linux
389-
<<: *job-linux-16c
389+
<<: *job-linux-8c
390390

391391
- name: dist-various-1
392-
<<: *job-linux-16c
392+
<<: *job-linux-8c
393393

394394
- name: dist-various-2
395-
<<: *job-linux-16c
395+
<<: *job-linux-8c
396396

397397
- name: dist-x86_64-freebsd
398-
<<: *job-linux-16c
398+
<<: *job-linux-8c
399399

400400
- name: dist-x86_64-illumos
401-
<<: *job-linux-16c
401+
<<: *job-linux-8c
402402

403403
- &dist-x86_64-linux
404404
name: dist-x86_64-linux
@@ -410,10 +410,10 @@ jobs:
410410
<<: *job-linux-16c
411411

412412
- name: dist-x86_64-musl
413-
<<: *job-linux-16c
413+
<<: *job-linux-8c
414414

415415
- name: dist-x86_64-netbsd
416-
<<: *job-linux-16c
416+
<<: *job-linux-8c
417417

418418
- name: i686-gnu
419419
<<: *job-linux-16c
@@ -422,16 +422,16 @@ jobs:
422422
<<: *job-linux-16c
423423

424424
- name: mingw-check
425-
<<: *job-linux-16c
425+
<<: *job-linux-8c
426426

427427
- name: test-various
428-
<<: *job-linux-16c
428+
<<: *job-linux-8c
429429

430430
- name: wasm32
431-
<<: *job-linux-16c
431+
<<: *job-linux-8c
432432

433433
- name: x86_64-gnu
434-
<<: *job-linux-16c
434+
<<: *job-linux-8c
435435

436436
# This job ensures commits landing on nightly still pass the full
437437
# test suite on the stable channel. There are some UI tests that
@@ -446,39 +446,39 @@ jobs:
446446
# could cause failures when `dev: 1` in `stage0.txt`, and running
447447
# this on stable is useless.
448448
CI_ONLY_WHEN_CHANNEL: nightly
449-
<<: *job-linux-16c
449+
<<: *job-linux-8c
450450

451451
- name: x86_64-gnu-aux
452-
<<: *job-linux-16c
452+
<<: *job-linux-8c
453453

454454
- name: x86_64-gnu-debug
455-
<<: *job-linux-16c
455+
<<: *job-linux-8c
456456

457457
- name: x86_64-gnu-distcheck
458-
<<: *job-linux-16c
458+
<<: *job-linux-8c
459459

460460
- name: x86_64-gnu-llvm-15
461461
env:
462462
RUST_BACKTRACE: 1
463-
<<: *job-linux-16c
463+
<<: *job-linux-8c
464464

465465
- name: x86_64-gnu-llvm-14
466466
env:
467467
RUST_BACKTRACE: 1
468-
<<: *job-linux-16c
468+
<<: *job-linux-8c
469469

470470
- name: x86_64-gnu-llvm-14-stage1
471471
env:
472472
RUST_BACKTRACE: 1
473-
<<: *job-linux-16c
473+
<<: *job-linux-8c
474474

475475
- name: x86_64-gnu-nopt
476-
<<: *job-linux-16c
476+
<<: *job-linux-8c
477477

478478
- name: x86_64-gnu-tools
479479
env:
480480
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
481-
<<: *job-linux-16c
481+
<<: *job-linux-8c
482482

483483
####################
484484
# macOS Builders #

0 commit comments

Comments
 (0)