Skip to content

Commit 53a4003

Browse files
Mark-SimulacrumMark-Simulacrum
committed
Switch all job names to include core count
This will allow moving jobs between 8 and 16 core VMs in the next commit more easily.
1 parent d4be8ef commit 53a4003

File tree

1 file changed

+72
-64
lines changed

1 file changed

+72
-64
lines changed

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

+72-64
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,26 @@ x--expand-yaml-anchors--remove:
7373
- &base-job
7474
env: {}
7575

76-
- &job-linux-xl
76+
- &job-linux-8c
77+
os: ubuntu-20.04-8core-32gb
78+
<<: *base-job
79+
80+
- &job-linux-16c
7781
os: ubuntu-20.04-16core-64gb
7882
<<: *base-job
7983

8084
- &job-macos-xl
8185
os: macos-12-xl
8286
<<: *base-job
8387

84-
- &job-windows-xl
88+
- &job-windows-8c
8589
os: windows-2019-8core-32gb
8690
<<: *base-job
8791

92+
- &job-windows-16c
93+
os: windows-2019-16core-64gb
94+
<<: *base-job
95+
8896
- &job-aarch64-linux
8997
os: [self-hosted, ARM64, linux]
9098

@@ -293,19 +301,19 @@ jobs:
293301
matrix:
294302
include:
295303
- name: mingw-check
296-
<<: *job-linux-xl
304+
<<: *job-linux-16c
297305
tidy: false
298306

299307
- name: mingw-check-tidy
300-
<<: *job-linux-xl
308+
<<: *job-linux-16c
301309
tidy: true
302310

303311
- name: x86_64-gnu-llvm-14
304-
<<: *job-linux-xl
312+
<<: *job-linux-16c
305313
tidy: false
306314

307315
- name: x86_64-gnu-tools
308-
<<: *job-linux-xl
316+
<<: *job-linux-16c
309317
tidy: false
310318

311319
auto:
@@ -327,103 +335,103 @@ jobs:
327335
<<: *job-aarch64-linux
328336

329337
- name: arm-android
330-
<<: *job-linux-xl
338+
<<: *job-linux-16c
331339

332340
- name: armhf-gnu
333-
<<: *job-linux-xl
341+
<<: *job-linux-16c
334342

335343
- name: dist-aarch64-linux
336-
<<: *job-linux-xl
344+
<<: *job-linux-16c
337345

338346
- name: dist-android
339-
<<: *job-linux-xl
347+
<<: *job-linux-16c
340348

341349
- name: dist-arm-linux
342-
<<: *job-linux-xl
350+
<<: *job-linux-16c
343351

344352
- name: dist-armhf-linux
345-
<<: *job-linux-xl
353+
<<: *job-linux-16c
346354

347355
- name: dist-armv7-linux
348-
<<: *job-linux-xl
356+
<<: *job-linux-16c
349357

350358
- name: dist-i586-gnu-i586-i686-musl
351-
<<: *job-linux-xl
359+
<<: *job-linux-16c
352360

353361
- name: dist-i686-linux
354-
<<: *job-linux-xl
362+
<<: *job-linux-16c
355363

356364
- name: dist-mips-linux
357-
<<: *job-linux-xl
365+
<<: *job-linux-16c
358366

359367
- name: dist-mips64-linux
360-
<<: *job-linux-xl
368+
<<: *job-linux-16c
361369

362370
- name: dist-mips64el-linux
363-
<<: *job-linux-xl
371+
<<: *job-linux-16c
364372

365373
- name: dist-mipsel-linux
366-
<<: *job-linux-xl
374+
<<: *job-linux-16c
367375

368376
- name: dist-powerpc-linux
369-
<<: *job-linux-xl
377+
<<: *job-linux-16c
370378

371379
- name: dist-powerpc64-linux
372-
<<: *job-linux-xl
380+
<<: *job-linux-16c
373381

374382
- name: dist-powerpc64le-linux
375-
<<: *job-linux-xl
383+
<<: *job-linux-16c
376384

377385
- name: dist-riscv64-linux
378-
<<: *job-linux-xl
386+
<<: *job-linux-16c
379387

380388
- name: dist-s390x-linux
381-
<<: *job-linux-xl
389+
<<: *job-linux-16c
382390

383391
- name: dist-various-1
384-
<<: *job-linux-xl
392+
<<: *job-linux-16c
385393

386394
- name: dist-various-2
387-
<<: *job-linux-xl
395+
<<: *job-linux-16c
388396

389397
- name: dist-x86_64-freebsd
390-
<<: *job-linux-xl
398+
<<: *job-linux-16c
391399

392400
- name: dist-x86_64-illumos
393-
<<: *job-linux-xl
401+
<<: *job-linux-16c
394402

395403
- &dist-x86_64-linux
396404
name: dist-x86_64-linux
397-
<<: *job-linux-xl
405+
<<: *job-linux-16c
398406

399407
- name: dist-x86_64-linux-alt
400408
env:
401409
IMAGE: dist-x86_64-linux
402-
<<: *job-linux-xl
410+
<<: *job-linux-16c
403411

404412
- name: dist-x86_64-musl
405-
<<: *job-linux-xl
413+
<<: *job-linux-16c
406414

407415
- name: dist-x86_64-netbsd
408-
<<: *job-linux-xl
416+
<<: *job-linux-16c
409417

410418
- name: i686-gnu
411-
<<: *job-linux-xl
419+
<<: *job-linux-16c
412420

413421
- name: i686-gnu-nopt
414-
<<: *job-linux-xl
422+
<<: *job-linux-16c
415423

416424
- name: mingw-check
417-
<<: *job-linux-xl
425+
<<: *job-linux-16c
418426

419427
- name: test-various
420-
<<: *job-linux-xl
428+
<<: *job-linux-16c
421429

422430
- name: wasm32
423-
<<: *job-linux-xl
431+
<<: *job-linux-16c
424432

425433
- name: x86_64-gnu
426-
<<: *job-linux-xl
434+
<<: *job-linux-16c
427435

428436
# This job ensures commits landing on nightly still pass the full
429437
# test suite on the stable channel. There are some UI tests that
@@ -438,39 +446,39 @@ jobs:
438446
# could cause failures when `dev: 1` in `stage0.txt`, and running
439447
# this on stable is useless.
440448
CI_ONLY_WHEN_CHANNEL: nightly
441-
<<: *job-linux-xl
449+
<<: *job-linux-16c
442450

443451
- name: x86_64-gnu-aux
444-
<<: *job-linux-xl
452+
<<: *job-linux-16c
445453

446454
- name: x86_64-gnu-debug
447-
<<: *job-linux-xl
455+
<<: *job-linux-16c
448456

449457
- name: x86_64-gnu-distcheck
450-
<<: *job-linux-xl
458+
<<: *job-linux-16c
451459

452460
- name: x86_64-gnu-llvm-15
453461
env:
454462
RUST_BACKTRACE: 1
455-
<<: *job-linux-xl
463+
<<: *job-linux-16c
456464

457465
- name: x86_64-gnu-llvm-14
458466
env:
459467
RUST_BACKTRACE: 1
460-
<<: *job-linux-xl
468+
<<: *job-linux-16c
461469

462470
- name: x86_64-gnu-llvm-14-stage1
463471
env:
464472
RUST_BACKTRACE: 1
465-
<<: *job-linux-xl
473+
<<: *job-linux-16c
466474

467475
- name: x86_64-gnu-nopt
468-
<<: *job-linux-xl
476+
<<: *job-linux-16c
469477

470478
- name: x86_64-gnu-tools
471479
env:
472480
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
473-
<<: *job-linux-xl
481+
<<: *job-linux-16c
474482

475483
####################
476484
# macOS Builders #
@@ -572,38 +580,38 @@ jobs:
572580
env:
573581
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
574582
SCRIPT: make ci-subset-1
575-
<<: *job-windows-xl
583+
<<: *job-windows-8c
576584

577585
- name: x86_64-msvc-2
578586
env:
579587
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
580588
SCRIPT: make ci-subset-2
581-
<<: *job-windows-xl
589+
<<: *job-windows-8c
582590

583591
- name: i686-msvc-1
584592
env:
585593
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
586594
SCRIPT: make ci-subset-1
587-
<<: *job-windows-xl
595+
<<: *job-windows-8c
588596

589597
- name: i686-msvc-2
590598
env:
591599
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
592600
SCRIPT: make ci-subset-2
593-
<<: *job-windows-xl
601+
<<: *job-windows-8c
594602

595603
- name: x86_64-msvc-cargo
596604
env:
597605
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo
598606
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
599-
<<: *job-windows-xl
607+
<<: *job-windows-8c
600608

601609
- name: x86_64-msvc-tools
602610
env:
603611
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
604612
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json
605613
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
606-
<<: *job-windows-xl
614+
<<: *job-windows-8c
607615

608616
# 32/64-bit MinGW builds.
609617
#
@@ -629,7 +637,7 @@ jobs:
629637
# incompatible with LLVM downloads today).
630638
NO_DOWNLOAD_CI_LLVM: 1
631639
CUSTOM_MINGW: 1
632-
<<: *job-windows-xl
640+
<<: *job-windows-8c
633641

634642
- name: i686-mingw-2
635643
env:
@@ -639,7 +647,7 @@ jobs:
639647
# incompatible with LLVM downloads today).
640648
NO_DOWNLOAD_CI_LLVM: 1
641649
CUSTOM_MINGW: 1
642-
<<: *job-windows-xl
650+
<<: *job-windows-8c
643651

644652
- name: x86_64-mingw-1
645653
env:
@@ -651,7 +659,7 @@ jobs:
651659
# incompatible with LLVM downloads today).
652660
NO_DOWNLOAD_CI_LLVM: 1
653661
CUSTOM_MINGW: 1
654-
<<: *job-windows-xl
662+
<<: *job-windows-8c
655663

656664
- name: x86_64-mingw-2
657665
env:
@@ -663,7 +671,7 @@ jobs:
663671
# incompatible with LLVM downloads today).
664672
NO_DOWNLOAD_CI_LLVM: 1
665673
CUSTOM_MINGW: 1
666-
<<: *job-windows-xl
674+
<<: *job-windows-8c
667675

668676
- name: dist-x86_64-msvc
669677
env:
@@ -675,7 +683,7 @@ jobs:
675683
--enable-profiler
676684
SCRIPT: PGO_HOST=x86_64-pc-windows-msvc python src/ci/stage-build.py python x.py dist bootstrap --include-default-paths
677685
DIST_REQUIRE_ALL_TOOLS: 1
678-
<<: *job-windows-xl
686+
<<: *job-windows-8c
679687

680688
- name: dist-i686-msvc
681689
env:
@@ -687,7 +695,7 @@ jobs:
687695
--enable-profiler
688696
SCRIPT: python x.py dist bootstrap --include-default-paths
689697
DIST_REQUIRE_ALL_TOOLS: 1
690-
<<: *job-windows-xl
698+
<<: *job-windows-8c
691699

692700
- name: dist-aarch64-msvc
693701
env:
@@ -701,7 +709,7 @@ jobs:
701709
# Hack around this SDK version, because it doesn't work with clang.
702710
# See https://github.com/rust-lang/rust/issues/88796
703711
WINDOWS_SDK_20348_HACK: 1
704-
<<: *job-windows-xl
712+
<<: *job-windows-8c
705713

706714
- name: dist-i686-mingw
707715
env:
@@ -715,7 +723,7 @@ jobs:
715723
SCRIPT: python x.py dist bootstrap --include-default-paths
716724
CUSTOM_MINGW: 1
717725
DIST_REQUIRE_ALL_TOOLS: 1
718-
<<: *job-windows-xl
726+
<<: *job-windows-8c
719727

720728
- name: dist-x86_64-mingw
721729
env:
@@ -729,13 +737,13 @@ jobs:
729737
NO_DOWNLOAD_CI_LLVM: 1
730738
CUSTOM_MINGW: 1
731739
DIST_REQUIRE_ALL_TOOLS: 1
732-
<<: *job-windows-xl
740+
<<: *job-windows-8c
733741

734742
- name: dist-x86_64-msvc-alt
735743
env:
736744
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
737745
SCRIPT: python x.py dist bootstrap --include-default-paths
738-
<<: *job-windows-xl
746+
<<: *job-windows-8c
739747

740748
try:
741749
permissions:
@@ -750,7 +758,7 @@ jobs:
750758
include:
751759
- &dist-x86_64-linux
752760
name: dist-x86_64-linux
753-
<<: *job-linux-xl
761+
<<: *job-linux-16c
754762

755763
master:
756764
name: master

0 commit comments

Comments
 (0)