nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move us to the new large runners pool

Browse Source 
For now this keeps all the configuration identical (AFAICT) but we'll
likely want to play with the specifics to move some of the slower
builders to larger machines and the faster builders to smaller machines,
likely reducing overall usage and improving CI times.
This commit is contained in:
Mark Rousskov 2023-03-18 20:01:33 -04:00
parent 13afbdaa06
commit f83dfd9f86
2 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
.github/workflows/ci.yml vendored
View File

@ -48,19 +48,19 @@ jobs:
include: include:
- name: mingw-check - name: mingw-check
tidy: false tidy: false
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: mingw-check-tidy - name: mingw-check-tidy
tidy: true tidy: true
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: x86_64-gnu-llvm-14 - name: x86_64-gnu-llvm-14
tidy: false tidy: false
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: x86_64-gnu-tools - name: x86_64-gnu-tools
tidy: false tidy: false
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
timeout-minutes: 600 timeout-minutes: 600
runs-on: "${{ matrix.os }}" runs-on: "${{ matrix.os }}"
@ -181,136 +181,136 @@ jobs:
- ARM64 - ARM64
- linux - linux
- name: arm-android - name: arm-android
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: armhf-gnu - name: armhf-gnu
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-aarch64-linux - name: dist-aarch64-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-android - name: dist-android
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-arm-linux - name: dist-arm-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-armhf-linux - name: dist-armhf-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-armv7-linux - name: dist-armv7-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-i586-gnu-i586-i686-musl - name: dist-i586-gnu-i586-i686-musl
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-i686-linux - name: dist-i686-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-mips-linux - name: dist-mips-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-mips64-linux - name: dist-mips64-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-mips64el-linux - name: dist-mips64el-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-mipsel-linux - name: dist-mipsel-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-powerpc-linux - name: dist-powerpc-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-powerpc64-linux - name: dist-powerpc64-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-powerpc64le-linux - name: dist-powerpc64le-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-riscv64-linux - name: dist-riscv64-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-s390x-linux - name: dist-s390x-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-various-1 - name: dist-various-1
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-various-2 - name: dist-various-2
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-x86_64-freebsd - name: dist-x86_64-freebsd
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-x86_64-illumos - name: dist-x86_64-illumos
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-x86_64-linux - name: dist-x86_64-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-x86_64-linux-alt - name: dist-x86_64-linux-alt
env: env:
IMAGE: dist-x86_64-linux IMAGE: dist-x86_64-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
- name: dist-x86_64-musl - name: dist-x86_64-musl
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: dist-x86_64-netbsd - name: dist-x86_64-netbsd
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: i686-gnu - name: i686-gnu
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: i686-gnu-nopt - name: i686-gnu-nopt
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: mingw-check - name: mingw-check
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: test-various - name: test-various
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: wasm32 - name: wasm32
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: x86_64-gnu - name: x86_64-gnu
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
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-xl os: ubuntu-20.04-16core-64gb
- name: x86_64-gnu-aux - name: x86_64-gnu-aux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: x86_64-gnu-debug - name: x86_64-gnu-debug
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
- name: x86_64-gnu-distcheck - name: x86_64-gnu-distcheck
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
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-xl os: ubuntu-20.04-16core-64gb
- name: x86_64-gnu-llvm-14 - name: x86_64-gnu-llvm-14
env: env:
RUST_BACKTRACE: 1 RUST_BACKTRACE: 1
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
- 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-xl os: ubuntu-20.04-16core-64gb
- name: x86_64-gnu-nopt - name: x86_64-gnu-nopt
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
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-xl os: ubuntu-20.04-16core-64gb
- 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"
@ -386,80 +386,80 @@ jobs:
env: env:
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler" RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
SCRIPT: make ci-subset-1 SCRIPT: make ci-subset-1
os: windows-latest-xl os: windows-2019-8core-32gb
- name: x86_64-msvc-2 - name: x86_64-msvc-2
env: env:
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler" RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
SCRIPT: make ci-subset-2 SCRIPT: make ci-subset-2
os: windows-latest-xl os: windows-2019-8core-32gb
- name: i686-msvc-1 - name: i686-msvc-1
env: env:
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc" RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc"
SCRIPT: make ci-subset-1 SCRIPT: make ci-subset-1
os: windows-latest-xl os: windows-2019-8core-32gb
- name: i686-msvc-2 - name: i686-msvc-2
env: env:
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc" RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc"
SCRIPT: make ci-subset-2 SCRIPT: make ci-subset-2
os: windows-latest-xl os: windows-2019-8core-32gb
- name: x86_64-msvc-cargo - name: x86_64-msvc-cargo
env: env:
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld" RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld"
os: windows-latest-xl os: windows-2019-8core-32gb
- name: x86_64-msvc-tools - name: x86_64-msvc-tools
env: env:
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json" RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json"
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
os: windows-latest-xl os: windows-2019-8core-32gb
- name: i686-mingw-1 - name: i686-mingw-1
env: env:
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu" RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
SCRIPT: make ci-mingw-subset-1 SCRIPT: make ci-mingw-subset-1
NO_DOWNLOAD_CI_LLVM: 1 NO_DOWNLOAD_CI_LLVM: 1
CUSTOM_MINGW: 1 CUSTOM_MINGW: 1
os: windows-latest-xl os: windows-2019-8core-32gb
- name: i686-mingw-2 - name: i686-mingw-2
env: env:
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu" RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
SCRIPT: make ci-mingw-subset-2 SCRIPT: make ci-mingw-subset-2
NO_DOWNLOAD_CI_LLVM: 1 NO_DOWNLOAD_CI_LLVM: 1
CUSTOM_MINGW: 1 CUSTOM_MINGW: 1
os: windows-latest-xl os: windows-2019-8core-32gb
- name: x86_64-mingw-1 - name: x86_64-mingw-1
env: env:
SCRIPT: make ci-mingw-subset-1 SCRIPT: make ci-mingw-subset-1
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler" RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
NO_DOWNLOAD_CI_LLVM: 1 NO_DOWNLOAD_CI_LLVM: 1
CUSTOM_MINGW: 1 CUSTOM_MINGW: 1
os: windows-latest-xl os: windows-2019-8core-32gb
- name: x86_64-mingw-2 - name: x86_64-mingw-2
env: env:
SCRIPT: make ci-mingw-subset-2 SCRIPT: make ci-mingw-subset-2
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler" RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
NO_DOWNLOAD_CI_LLVM: 1 NO_DOWNLOAD_CI_LLVM: 1
CUSTOM_MINGW: 1 CUSTOM_MINGW: 1
os: windows-latest-xl os: windows-2019-8core-32gb
- name: dist-x86_64-msvc - name: dist-x86_64-msvc
env: env:
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler" RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler"
SCRIPT: PGO_HOST=x86_64-pc-windows-msvc python src/ci/stage-build.py python x.py dist bootstrap --include-default-paths SCRIPT: PGO_HOST=x86_64-pc-windows-msvc python src/ci/stage-build.py python x.py dist bootstrap --include-default-paths
DIST_REQUIRE_ALL_TOOLS: 1 DIST_REQUIRE_ALL_TOOLS: 1
os: windows-latest-xl os: windows-2019-8core-32gb
- name: dist-i686-msvc - name: dist-i686-msvc
env: env:
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i686-pc-windows-msvc,i586-pc-windows-msvc --enable-full-tools --enable-profiler" RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i686-pc-windows-msvc,i586-pc-windows-msvc --enable-full-tools --enable-profiler"
SCRIPT: python x.py dist bootstrap --include-default-paths SCRIPT: python x.py dist bootstrap --include-default-paths
DIST_REQUIRE_ALL_TOOLS: 1 DIST_REQUIRE_ALL_TOOLS: 1
os: windows-latest-xl os: windows-2019-8core-32gb
- name: dist-aarch64-msvc - name: dist-aarch64-msvc
env: env:
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=aarch64-pc-windows-msvc --enable-full-tools --enable-profiler" RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=aarch64-pc-windows-msvc --enable-full-tools --enable-profiler"
SCRIPT: python x.py dist bootstrap --include-default-paths SCRIPT: python x.py dist bootstrap --include-default-paths
DIST_REQUIRE_ALL_TOOLS: 1 DIST_REQUIRE_ALL_TOOLS: 1
WINDOWS_SDK_20348_HACK: 1 WINDOWS_SDK_20348_HACK: 1
os: windows-latest-xl os: windows-2019-8core-32gb
- name: dist-i686-mingw - name: dist-i686-mingw
env: env:
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler" RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
@ -467,7 +467,7 @@ jobs:
SCRIPT: python x.py dist bootstrap --include-default-paths SCRIPT: python x.py dist bootstrap --include-default-paths
CUSTOM_MINGW: 1 CUSTOM_MINGW: 1
DIST_REQUIRE_ALL_TOOLS: 1 DIST_REQUIRE_ALL_TOOLS: 1
os: windows-latest-xl os: windows-2019-8core-32gb
- name: dist-x86_64-mingw - name: dist-x86_64-mingw
env: env:
SCRIPT: python x.py dist bootstrap --include-default-paths SCRIPT: python x.py dist bootstrap --include-default-paths
@ -475,12 +475,12 @@ jobs:
NO_DOWNLOAD_CI_LLVM: 1 NO_DOWNLOAD_CI_LLVM: 1
CUSTOM_MINGW: 1 CUSTOM_MINGW: 1
DIST_REQUIRE_ALL_TOOLS: 1 DIST_REQUIRE_ALL_TOOLS: 1
os: windows-latest-xl os: windows-2019-8core-32gb
- name: dist-x86_64-msvc-alt - name: dist-x86_64-msvc-alt
env: env:
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler" RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
SCRIPT: python x.py dist bootstrap --include-default-paths SCRIPT: python x.py dist bootstrap --include-default-paths
os: windows-latest-xl os: windows-2019-8core-32gb
timeout-minutes: 600 timeout-minutes: 600
runs-on: "${{ matrix.os }}" runs-on: "${{ matrix.os }}"
steps: steps:
@ -595,7 +595,7 @@ jobs:
matrix: matrix:
include: include:
- name: dist-x86_64-linux - name: dist-x86_64-linux
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
env: {} env: {}
timeout-minutes: 600 timeout-minutes: 600
runs-on: "${{ matrix.os }}" runs-on: "${{ matrix.os }}"

4
src/ci/github-actions/ci.yml
View File

@ -74,7 +74,7 @@ x--expand-yaml-anchors--remove:
env: {} env: {}
- &job-linux-xl - &job-linux-xl
os: ubuntu-20.04-xl os: ubuntu-20.04-16core-64gb
<<: *base-job <<: *base-job
- &job-macos-xl - &job-macos-xl
@ -82,7 +82,7 @@ x--expand-yaml-anchors--remove:
<<: *base-job <<: *base-job
- &job-windows-xl - &job-windows-xl
os: windows-latest-xl os: windows-2019-8core-32gb
<<: *base-job <<: *base-job
- &job-aarch64-linux - &job-aarch64-linux