Skip to content

Commit 2cbc570

Browse files
borsbors
committed
Auto merge of rust-lang#76884 - Mark-Simulacrum:fix-macos-ci, r=pietroalbini
Add host triples to target lists This PR is primarily intended to fix rust-lang/rustup#2494, which is the second commit. That bug was introduced by rust-lang#76415, and incompletely fixed by rust-lang#76639. (rust-lang#76639 added host triples, which gave us compilers, but missed that we also need documentation and other target-only things). However, it also removes duplicate macOS CI builders. r? `@pietroalbini`
2 parents 9f8ac71 + d0dff8f commit 2cbc570

File tree

3 files changed

+5
-70
lines changed

3 files changed

+5
-70
lines changed

‎.github/workflows/ci.yml

+2-31
Original file line numberDiff line numberDiff line change
@@ -378,36 +378,7 @@ jobs:
378378
- name: dist-x86_64-apple
379379
env:
380380
SCRIPT: "./x.py dist"
381-
RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
382-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
383-
MACOSX_DEPLOYMENT_TARGET: 10.7
384-
NO_LLVM_ASSERTIONS: 1
385-
NO_DEBUG_ASSERTIONS: 1
386-
DIST_REQUIRE_ALL_TOOLS: 1
387-
os: macos-latest
388-
- name: dist-x86_64-apple-alt
389-
env:
390-
SCRIPT: "./x.py dist"
391-
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
392-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
393-
MACOSX_DEPLOYMENT_TARGET: 10.7
394-
NO_LLVM_ASSERTIONS: 1
395-
NO_DEBUG_ASSERTIONS: 1
396-
os: macos-latest
397-
- name: x86_64-apple
398-
env:
399-
SCRIPT: "./x.py --stage 2 test"
400-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
401-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
402-
MACOSX_DEPLOYMENT_TARGET: 10.8
403-
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
404-
NO_LLVM_ASSERTIONS: 1
405-
NO_DEBUG_ASSERTIONS: 1
406-
os: macos-latest
407-
- name: dist-x86_64-apple
408-
env:
409-
SCRIPT: "./x.py dist"
410-
RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
381+
RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
411382
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
412383
MACOSX_DEPLOYMENT_TARGET: 10.7
413384
NO_LLVM_ASSERTIONS: 1
@@ -508,7 +479,7 @@ jobs:
508479
os: windows-latest-xl
509480
- name: dist-i686-msvc
510481
env:
511-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i586-pc-windows-msvc --enable-full-tools --enable-profiler"
482+
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"
512483
SCRIPT: python x.py dist
513484
DIST_REQUIRE_ALL_TOOLS: 1
514485
os: windows-latest-xl

‎src/ci/azure-pipelines/auto.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
dist-x86_64-apple:
4848
SCRIPT: ./x.py dist
49-
INITIAL_RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
49+
INITIAL_RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
5050
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
5151
MACOSX_DEPLOYMENT_TARGET: 10.7
5252
NO_LLVM_ASSERTIONS: 1

‎src/ci/github-actions/ci.yml

+2-38
Original file line numberDiff line numberDiff line change
@@ -439,43 +439,7 @@ jobs:
439439
- name: dist-x86_64-apple
440440
env:
441441
SCRIPT: ./x.py dist
442-
RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
443-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
444-
MACOSX_DEPLOYMENT_TARGET: 10.7
445-
NO_LLVM_ASSERTIONS: 1
446-
NO_DEBUG_ASSERTIONS: 1
447-
DIST_REQUIRE_ALL_TOOLS: 1
448-
<<: *job-macos-xl
449-
450-
- name: dist-x86_64-apple-alt
451-
env:
452-
SCRIPT: ./x.py dist
453-
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false
454-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
455-
MACOSX_DEPLOYMENT_TARGET: 10.7
456-
NO_LLVM_ASSERTIONS: 1
457-
NO_DEBUG_ASSERTIONS: 1
458-
<<: *job-macos-xl
459-
460-
- name: x86_64-apple
461-
env:
462-
SCRIPT: ./x.py --stage 2 test
463-
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
464-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
465-
MACOSX_DEPLOYMENT_TARGET: 10.8
466-
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
467-
NO_LLVM_ASSERTIONS: 1
468-
NO_DEBUG_ASSERTIONS: 1
469-
<<: *job-macos-xl
470-
471-
####################
472-
# macOS Builders #
473-
####################
474-
475-
- name: dist-x86_64-apple
476-
env:
477-
SCRIPT: ./x.py dist
478-
RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
442+
RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
479443
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
480444
MACOSX_DEPLOYMENT_TARGET: 10.7
481445
NO_LLVM_ASSERTIONS: 1
@@ -624,7 +588,7 @@ jobs:
624588
RUST_CONFIGURE_ARGS: >-
625589
--build=i686-pc-windows-msvc
626590
--host=i686-pc-windows-msvc
627-
--target=i586-pc-windows-msvc
591+
--target=i686-pc-windows-msvc,i586-pc-windows-msvc
628592
--enable-full-tools
629593
--enable-profiler
630594
SCRIPT: python x.py dist

0 commit comments

Comments
 (0)