about summary refs log tree commit diff
path: root/src/ci/github-actions
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2022-01-28 12:26:36 -0500
committerMark Rousskov <mark.simulacrum@gmail.com>2022-01-28 12:29:09 -0500
commitb726f285dafb26ad6ef5f7498c23621ec5574737 (patch)
tree95be08553c5a2f612e1ceef99254b48b90583d87 /src/ci/github-actions
parent427eba2f0bacdeaebc992a78eb2889564de7d7cf (diff)
downloadrust-b726f285dafb26ad6ef5f7498c23621ec5574737.tar.gz
rust-b726f285dafb26ad6ef5f7498c23621ec5574737.zip
Move target-only apple targets to separate builder
Diffstat (limited to 'src/ci/github-actions')
-rw-r--r--src/ci/github-actions/ci.yml17
1 files changed, 13 insertions, 4 deletions
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