diff options
| author | bors <bors@rust-lang.org> | 2022-01-29 02:20:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-29 02:20:00 +0000 |
| commit | 24ae9960c5116a6d1e827c58327e6d231e4fe174 (patch) | |
| tree | 1ebff8eb4d05e13ae8430acdcfa800b742a056fe | |
| parent | 6250d5a08cf0870d3655fa98b83718bc01ff6f45 (diff) | |
| parent | b726f285dafb26ad6ef5f7498c23621ec5574737 (diff) | |
| download | rust-24ae9960c5116a6d1e827c58327e6d231e4fe174.tar.gz rust-24ae9960c5116a6d1e827c58327e6d231e4fe174.zip | |
Auto merge of #93434 - Mark-Simulacrum:apple-various, r=pietroalbini
Move tier-2 (without host tools) apple targets to separate builder One-off (likely fairly unreliable, but give some idea) measurements: * dist-apple-various (new): 2h10m * dist-x86_64-apple: 2h55m -> 2h36m (cutting roughly 20 minutes)
| -rw-r--r-- | .github/workflows/ci.yml | 14 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 17 |
2 files changed, 25 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf85591ac01..e97cd29bba5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -290,8 +290,8 @@ jobs: os: ubuntu-20.04-xl - name: dist-x86_64-apple env: - SCRIPT: "./x.py dist --exclude rust-docs --exclude extended && ./x.py dist --target=x86_64-apple-darwin rust-docs && ./x.py dist extended" - RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false" + SCRIPT: "./x.py dist --host=x86_64-apple-darwin --target=x86_64-apple-darwin" + RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false" RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 MACOSX_DEPLOYMENT_TARGET: 10.7 NO_LLVM_ASSERTIONS: 1 @@ -299,6 +299,16 @@ jobs: NO_OVERFLOW_CHECKS: 1 DIST_REQUIRE_ALL_TOOLS: 1 os: macos-latest + - name: dist-apple-various + env: + SCRIPT: "./x.py dist --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim" + RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false" + RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + MACOSX_DEPLOYMENT_TARGET: 10.7 + NO_LLVM_ASSERTIONS: 1 + NO_DEBUG_ASSERTIONS: 1 + NO_OVERFLOW_CHECKS: 1 + os: macos-latest - name: dist-x86_64-apple-alt env: SCRIPT: "./x.py dist" diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 80348468976..1a1472ea861 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -452,12 +452,10 @@ jobs: # macOS Builders # #################### - # Only generate documentation for x86_64-apple-darwin, not other - # tier 2 targets produced by this builder. - name: dist-x86_64-apple env: - SCRIPT: ./x.py dist --exclude rust-docs --exclude extended && ./x.py dist --target=x86_64-apple-darwin rust-docs && ./x.py dist extended - RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false + SCRIPT: ./x.py dist --host=x86_64-apple-darwin --target=x86_64-apple-darwin + RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 MACOSX_DEPLOYMENT_TARGET: 10.7 NO_LLVM_ASSERTIONS: 1 @@ -466,6 +464,17 @@ jobs: DIST_REQUIRE_ALL_TOOLS: 1 <<: *job-macos-xl + - name: dist-apple-various + env: + SCRIPT: ./x.py dist --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim + RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false + RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + MACOSX_DEPLOYMENT_TARGET: 10.7 + NO_LLVM_ASSERTIONS: 1 + NO_DEBUG_ASSERTIONS: 1 + NO_OVERFLOW_CHECKS: 1 + <<: *job-macos-xl + - name: dist-x86_64-apple-alt env: SCRIPT: ./x.py dist |