diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-02-11 07:48:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 07:48:09 +0100 |
| commit | 219fc8f9f06100c675580fab9a875678b9c037a2 (patch) | |
| tree | 09a4c00b61ae694bc70ec680eccf9cd1379feb75 | |
| parent | a59d312280d7fdc5537a9216c2d4eff2594b8515 (diff) | |
| parent | a023be99c63524bdd784893f79591609b36258de (diff) | |
| download | rust-219fc8f9f06100c675580fab9a875678b9c037a2.tar.gz rust-219fc8f9f06100c675580fab9a875678b9c037a2.zip | |
Rollup merge of #93862 - Mark-Simulacrum:apple-split, r=pietroalbini
Split x86_64-apple builder into two This splits out roughly 20-25 minutes of work, which should result in roughly parity with some of the other apple builders at approximately 2.2-2.4 hours per successful build. r? `@pietroalbini`
| -rw-r--r-- | .github/workflows/ci.yml | 15 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 12 |
2 files changed, 22 insertions, 5 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e97cd29bba5..97a31d3c970 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -319,9 +319,20 @@ jobs: NO_DEBUG_ASSERTIONS: 1 NO_OVERFLOW_CHECKS: 1 os: macos-latest - - name: x86_64-apple + - name: x86_64-apple-1 env: - SCRIPT: "./x.py --stage 2 test" + SCRIPT: "./x.py --stage 2 test --exclude src/test/ui --exclude src/test/rustdoc --exclude src/test/run-make-fulldeps" + RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false" + RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + MACOSX_DEPLOYMENT_TARGET: 10.8 + MACOSX_STD_DEPLOYMENT_TARGET: 10.7 + NO_LLVM_ASSERTIONS: 1 + NO_DEBUG_ASSERTIONS: 1 + NO_OVERFLOW_CHECKS: 1 + os: macos-latest + - name: x86_64-apple-2 + env: + SCRIPT: "./x.py --stage 2 test src/test/ui src/test/rustdoc src/test/run-make-fulldeps" RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false" RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 MACOSX_DEPLOYMENT_TARGET: 10.8 diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 1a1472ea861..8abf4244a38 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -486,9 +486,9 @@ jobs: NO_OVERFLOW_CHECKS: 1 <<: *job-macos-xl - - name: x86_64-apple - env: - SCRIPT: ./x.py --stage 2 test + - name: x86_64-apple-1 + env: &env-x86_64-apple-tests + SCRIPT: ./x.py --stage 2 test --exclude src/test/ui --exclude src/test/rustdoc --exclude src/test/run-make-fulldeps RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 MACOSX_DEPLOYMENT_TARGET: 10.8 @@ -498,6 +498,12 @@ jobs: NO_OVERFLOW_CHECKS: 1 <<: *job-macos-xl + - name: x86_64-apple-2 + env: + SCRIPT: ./x.py --stage 2 test src/test/ui src/test/rustdoc src/test/run-make-fulldeps + <<: *env-x86_64-apple-tests + <<: *job-macos-xl + # This target only needs to support 11.0 and up as nothing else supports the hardware - name: dist-aarch64-apple env: |