Skip to content

Commit fef27e0

Browse files
borsbors
committed
Auto merge of rust-lang#110142 - Mark-Simulacrum:reduce-core-counts, r=pietroalbini
Reduce core counts for a number of builders Best reviewed by-commit; first commit renames all builder names to include core counts. Applied changes for these builders (only on the auto branch, haven't touched PR CI): - arm-android -> 8 core (currently at 39 minutes; 25.58% CPU) - armhf-gnu -> 8 core (currently at 31 minutes; 30.97% CPU) - dist-aarch64-linux -> 8 core (currently at 35 minutes; 55.38% CPU) - dist-android -> 8 core (currently at 18 minutes; 43.03% CPU) - dist-armhf-linux -> 8 core (currently at 27 minutes; 54.71% CPU) - dist-armv7-linux -> 8 core (currently at 29 minutes; 50.33% CPU) - dist-i586-gnu-i586-i686-musl -> 8 core (currently at 27 minutes; 48.31% CPU) - dist-i686-linux -> 8 core (currently at 32 minutes; 52.39% CPU) - dist-mips-linux -> 8 core (currently at 25 minutes; 55.09% CPU) - dist-mips64-linux -> 8 core (currently at 25 minutes; 55.33% CPU) - dist-mips64el-linux -> 8 core (currently at 26 minutes; 54.93% CPU) - dist-mipsel-linux -> 8 core (currently at 25 minutes; 55.38% CPU) - dist-powerpc-linux -> 8 core (currently at 26 minutes; 55.77% CPU) - dist-powerpc64-linux -> 8 core (currently at 27 minutes; 55.03% CPU) - dist-powerpc64le-linux -> 8 core (currently at 27 minutes; 54.95% CPU) - dist-riscv64-linux -> 8 core (currently at 26 minutes; 54.43% CPU) - dist-s390x-linux -> 8 core (currently at 30 minutes; 55.97% CPU) - dist-various-1 -> 8 core (currently at 36 minutes; 29.16% CPU) - dist-various-2 -> 8 core (currently at 27 minutes; 32.69% CPU) - dist-x86_64-freebsd -> 8 core (currently at 27 minutes; 51.69% CPU) - dist-x86_64-illumos -> 8 core (currently at 30 minutes; 54.88% CPU) - dist-x86_64-musl -> 8 core (currently at 39 minutes; 57.56% CPU) - dist-x86_64-netbsd -> 8 core (currently at 26 minutes; 55.82% CPU) - mingw-check -> 8 core (currently at 17 minutes; 35.00% CPU) - test-various -> 8 core (currently at 22 minutes; 44.84% CPU) - wasm32 -> 8 core (currently at 19 minutes; 62.94% CPU) - x86_64-gnu -> 8 core (currently at 32 minutes; 50.31% CPU) - x86_64-gnu-stable -> 8 core (currently at 32 minutes; 51.23% CPU) - x86_64-gnu-aux -> 8 core (currently at 22 minutes; 46.39% CPU) - x86_64-gnu-debug -> 8 core (currently at 21 minutes; 53.93% CPU) - x86_64-gnu-distcheck -> 8 core (currently at 38 minutes; 55.93% CPU) - x86_64-gnu-llvm-15 -> 8 core (currently at 34 minutes; 52.99% CPU) - x86_64-gnu-llvm-14 -> 8 core (currently at 34 minutes; 52.09% CPU) - x86_64-gnu-llvm-14-stage1 -> 8 core (currently at 33 minutes; 51.13% CPU) - x86_64-gnu-nopt -> 8 core (currently at 29 minutes; 53.36% CPU) - x86_64-gnu-tools -> 8 core (currently at 22 minutes; 40.56% CPU) We may also want to look at merging some of these builders in the future (to deduplicate stage0 builds and such) but that can happen separately - and is more work than just adjusting core counts. r? `@pietroalbini`
2 parents 158c309 + 3153eaa commit fef27e0

File tree

2 files changed

+108
-100
lines changed

2 files changed

+108
-100
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"

0 commit comments

Comments
 (0)