Skip to content

Commit 82cd953

Browse files
committed
Auto merge of #110846 - jdno:reduce-builder-sizes, r=pietroalbini
Optimize builder sizes The infra-team is continuously monitoring the efficiency of the CI system in an effort to improve overall build times and resource usage. Some builders have used much less than their allocated resources, so we are testing smaller builder sizes for them. r? `@pietroalbini`
2 parents cad92b4 + 47528c0 commit 82cd953

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

.github/workflows/ci.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -260,13 +260,13 @@ jobs:
260260
os: ubuntu-20.04-8core-32gb
261261
env: {}
262262
- name: i686-gnu
263-
os: ubuntu-20.04-16core-64gb
263+
os: ubuntu-20.04-8core-32gb
264264
env: {}
265265
- name: i686-gnu-nopt
266-
os: ubuntu-20.04-16core-64gb
266+
os: ubuntu-20.04-8core-32gb
267267
env: {}
268268
- name: mingw-check
269-
os: ubuntu-20.04-8core-32gb
269+
os: ubuntu-20.04-4core-16gb
270270
env: {}
271271
- name: test-various
272272
os: ubuntu-20.04-8core-32gb
@@ -275,16 +275,16 @@ jobs:
275275
os: ubuntu-20.04-8core-32gb
276276
env: {}
277277
- name: x86_64-gnu
278-
os: ubuntu-20.04-8core-32gb
278+
os: ubuntu-20.04-4core-16gb
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-8core-32gb
285+
os: ubuntu-20.04-4core-16gb
286286
- name: x86_64-gnu-aux
287-
os: ubuntu-20.04-8core-32gb
287+
os: ubuntu-20.04-4core-16gb
288288
env: {}
289289
- name: x86_64-gnu-debug
290290
os: ubuntu-20.04-8core-32gb
@@ -309,7 +309,7 @@ jobs:
309309
RUST_BACKTRACE: 1
310310
os: ubuntu-20.04-8core-32gb
311311
- name: x86_64-gnu-nopt
312-
os: ubuntu-20.04-8core-32gb
312+
os: ubuntu-20.04-4core-16gb
313313
env: {}
314314
- name: x86_64-gnu-tools
315315
env:

src/ci/github-actions/ci.yml

+11-7
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ x--expand-yaml-anchors--remove:
7373
- &base-job
7474
env: {}
7575

76+
- &job-linux-4c
77+
os: ubuntu-20.04-4core-16gb
78+
<<: *base-job
79+
7680
- &job-linux-8c
7781
os: ubuntu-20.04-8core-32gb
7882
<<: *base-job
@@ -416,13 +420,13 @@ jobs:
416420
<<: *job-linux-8c
417421

418422
- name: i686-gnu
419-
<<: *job-linux-16c
423+
<<: *job-linux-8c
420424

421425
- name: i686-gnu-nopt
422-
<<: *job-linux-16c
426+
<<: *job-linux-8c
423427

424428
- name: mingw-check
425-
<<: *job-linux-8c
429+
<<: *job-linux-4c
426430

427431
- name: test-various
428432
<<: *job-linux-8c
@@ -431,7 +435,7 @@ jobs:
431435
<<: *job-linux-8c
432436

433437
- name: x86_64-gnu
434-
<<: *job-linux-8c
438+
<<: *job-linux-4c
435439

436440
# This job ensures commits landing on nightly still pass the full
437441
# test suite on the stable channel. There are some UI tests that
@@ -446,10 +450,10 @@ jobs:
446450
# could cause failures when `dev: 1` in `stage0.txt`, and running
447451
# this on stable is useless.
448452
CI_ONLY_WHEN_CHANNEL: nightly
449-
<<: *job-linux-8c
453+
<<: *job-linux-4c
450454

451455
- name: x86_64-gnu-aux
452-
<<: *job-linux-8c
456+
<<: *job-linux-4c
453457

454458
- name: x86_64-gnu-debug
455459
<<: *job-linux-8c
@@ -478,7 +482,7 @@ jobs:
478482
<<: *job-linux-8c
479483

480484
- name: x86_64-gnu-nopt
481-
<<: *job-linux-8c
485+
<<: *job-linux-4c
482486

483487
- name: x86_64-gnu-tools
484488
env:

0 commit comments

Comments
 (0)