mirror of
https://github.com/rust-lang/rust
synced 2024-11-02 14:59:06 +00:00
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.
This commit is contained in:
Mark Rousskov
parent
53a4003e49
commit
3153eaaeb5
2 changed files with 72 additions and 72 deletions
72
.github/workflows/ci.yml
vendored
72
.github/workflows/ci.yml
vendored
|
|
@ -181,70 +181,70 @@ jobs:
|
||||||
- ARM64
|
- ARM64
|
||||||
- linux
|
- linux
|
||||||
- name: arm-android
|
- name: arm-android
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: armhf-gnu
|
- name: armhf-gnu
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-aarch64-linux
|
- name: dist-aarch64-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-android
|
- name: dist-android
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-arm-linux
|
- name: dist-arm-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-16core-64gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-armhf-linux
|
- name: dist-armhf-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-armv7-linux
|
- name: dist-armv7-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-i586-gnu-i586-i686-musl
|
- name: dist-i586-gnu-i586-i686-musl
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-i686-linux
|
- name: dist-i686-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-mips-linux
|
- name: dist-mips-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-mips64-linux
|
- name: dist-mips64-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-mips64el-linux
|
- name: dist-mips64el-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-mipsel-linux
|
- name: dist-mipsel-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-powerpc-linux
|
- name: dist-powerpc-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-powerpc64-linux
|
- name: dist-powerpc64-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-powerpc64le-linux
|
- name: dist-powerpc64le-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-riscv64-linux
|
- name: dist-riscv64-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-s390x-linux
|
- name: dist-s390x-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-various-1
|
- name: dist-various-1
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-various-2
|
- name: dist-various-2
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-x86_64-freebsd
|
- name: dist-x86_64-freebsd
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-x86_64-illumos
|
- name: dist-x86_64-illumos
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-x86_64-linux
|
- name: dist-x86_64-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-16core-64gb
|
||||||
|
|
@ -254,10 +254,10 @@ jobs:
|
||||||
IMAGE: dist-x86_64-linux
|
IMAGE: dist-x86_64-linux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-16core-64gb
|
||||||
- name: dist-x86_64-musl
|
- name: dist-x86_64-musl
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: dist-x86_64-netbsd
|
- name: dist-x86_64-netbsd
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: i686-gnu
|
- name: i686-gnu
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-16core-64gb
|
||||||
|
|
@ -266,51 +266,51 @@ jobs:
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-16core-64gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: mingw-check
|
- name: mingw-check
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: test-various
|
- name: test-various
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: wasm32
|
- name: wasm32
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: x86_64-gnu
|
- name: x86_64-gnu
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: x86_64-gnu-stable
|
- name: x86_64-gnu-stable
|
||||||
env:
|
env:
|
||||||
IMAGE: x86_64-gnu
|
IMAGE: x86_64-gnu
|
||||||
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
|
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
|
||||||
CI_ONLY_WHEN_CHANNEL: nightly
|
CI_ONLY_WHEN_CHANNEL: nightly
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
- name: x86_64-gnu-aux
|
- name: x86_64-gnu-aux
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: x86_64-gnu-debug
|
- name: x86_64-gnu-debug
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: x86_64-gnu-distcheck
|
- name: x86_64-gnu-distcheck
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: x86_64-gnu-llvm-15
|
- name: x86_64-gnu-llvm-15
|
||||||
env:
|
env:
|
||||||
RUST_BACKTRACE: 1
|
RUST_BACKTRACE: 1
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
- name: x86_64-gnu-llvm-14
|
- name: x86_64-gnu-llvm-14
|
||||||
env:
|
env:
|
||||||
RUST_BACKTRACE: 1
|
RUST_BACKTRACE: 1
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
- name: x86_64-gnu-llvm-14-stage1
|
- name: x86_64-gnu-llvm-14-stage1
|
||||||
env:
|
env:
|
||||||
RUST_BACKTRACE: 1
|
RUST_BACKTRACE: 1
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
- name: x86_64-gnu-nopt
|
- name: x86_64-gnu-nopt
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
env: {}
|
env: {}
|
||||||
- name: x86_64-gnu-tools
|
- name: x86_64-gnu-tools
|
||||||
env:
|
env:
|
||||||
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
|
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
- name: dist-x86_64-apple
|
- name: dist-x86_64-apple
|
||||||
env:
|
env:
|
||||||
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
|
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
|
||||||
|
|
|
||||||
|
|
@ -335,70 +335,70 @@ jobs:
|
||||||
<<: *job-aarch64-linux
|
<<: *job-aarch64-linux
|
||||||
|
|
||||||
- name: arm-android
|
- name: arm-android
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: armhf-gnu
|
- name: armhf-gnu
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-aarch64-linux
|
- name: dist-aarch64-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-android
|
- name: dist-android
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-arm-linux
|
- name: dist-arm-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-16c
|
||||||
|
|
||||||
- name: dist-armhf-linux
|
- name: dist-armhf-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-armv7-linux
|
- name: dist-armv7-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-i586-gnu-i586-i686-musl
|
- name: dist-i586-gnu-i586-i686-musl
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-i686-linux
|
- name: dist-i686-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-mips-linux
|
- name: dist-mips-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-mips64-linux
|
- name: dist-mips64-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-mips64el-linux
|
- name: dist-mips64el-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-mipsel-linux
|
- name: dist-mipsel-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-powerpc-linux
|
- name: dist-powerpc-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-powerpc64-linux
|
- name: dist-powerpc64-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-powerpc64le-linux
|
- name: dist-powerpc64le-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-riscv64-linux
|
- name: dist-riscv64-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-s390x-linux
|
- name: dist-s390x-linux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-various-1
|
- name: dist-various-1
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-various-2
|
- name: dist-various-2
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-x86_64-freebsd
|
- name: dist-x86_64-freebsd
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-x86_64-illumos
|
- name: dist-x86_64-illumos
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- &dist-x86_64-linux
|
- &dist-x86_64-linux
|
||||||
name: dist-x86_64-linux
|
name: dist-x86_64-linux
|
||||||
|
|
@ -410,10 +410,10 @@ jobs:
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-16c
|
||||||
|
|
||||||
- name: dist-x86_64-musl
|
- name: dist-x86_64-musl
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: dist-x86_64-netbsd
|
- name: dist-x86_64-netbsd
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: i686-gnu
|
- name: i686-gnu
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-16c
|
||||||
|
|
@ -422,16 +422,16 @@ jobs:
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-16c
|
||||||
|
|
||||||
- name: mingw-check
|
- name: mingw-check
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: test-various
|
- name: test-various
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: wasm32
|
- name: wasm32
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: x86_64-gnu
|
- name: x86_64-gnu
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
# This job ensures commits landing on nightly still pass the full
|
# This job ensures commits landing on nightly still pass the full
|
||||||
# test suite on the stable channel. There are some UI tests that
|
# test suite on the stable channel. There are some UI tests that
|
||||||
|
|
@ -446,39 +446,39 @@ jobs:
|
||||||
# could cause failures when `dev: 1` in `stage0.txt`, and running
|
# could cause failures when `dev: 1` in `stage0.txt`, and running
|
||||||
# this on stable is useless.
|
# this on stable is useless.
|
||||||
CI_ONLY_WHEN_CHANNEL: nightly
|
CI_ONLY_WHEN_CHANNEL: nightly
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: x86_64-gnu-aux
|
- name: x86_64-gnu-aux
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: x86_64-gnu-debug
|
- name: x86_64-gnu-debug
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: x86_64-gnu-distcheck
|
- name: x86_64-gnu-distcheck
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: x86_64-gnu-llvm-15
|
- name: x86_64-gnu-llvm-15
|
||||||
env:
|
env:
|
||||||
RUST_BACKTRACE: 1
|
RUST_BACKTRACE: 1
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: x86_64-gnu-llvm-14
|
- name: x86_64-gnu-llvm-14
|
||||||
env:
|
env:
|
||||||
RUST_BACKTRACE: 1
|
RUST_BACKTRACE: 1
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: x86_64-gnu-llvm-14-stage1
|
- name: x86_64-gnu-llvm-14-stage1
|
||||||
env:
|
env:
|
||||||
RUST_BACKTRACE: 1
|
RUST_BACKTRACE: 1
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: x86_64-gnu-nopt
|
- name: x86_64-gnu-nopt
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: x86_64-gnu-tools
|
- name: x86_64-gnu-tools
|
||||||
env:
|
env:
|
||||||
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
|
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
####################
|
####################
|
||||||
# macOS Builders #
|
# macOS Builders #
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue