Skip to content

Commit c60ff10

Browse files
committed
Auto merge of rust-lang#115029 - ehuss:remove-apple-alt, r=Mark-Simulacrum
Remove apple-alt dist build. This removes the dist-x86_64-apple-alt build to reduce CI usage because I suspect nobody is using it. This builder is almost identical to the `dist-x86_64-apple` with the small difference that the latter adds `rust.lto=thin`, and I do not think that difference was intentional. The reason they are identical is because llvm assertions were disabled in rust-lang#44610, but I did not see any discussion about the consequence that this made the alt build identical to the normal build. Perhaps because rust-lang#44610 was intended to be temporary?
2 parents 5c6a7e7 + 889b55b commit c60ff10

File tree

2 files changed

+0
-23
lines changed

2 files changed

+0
-23
lines changed

.github/workflows/ci.yml

-11
Original file line numberDiff line numberDiff line change
@@ -323,17 +323,6 @@ jobs:
323323
NO_DEBUG_ASSERTIONS: 1
324324
NO_OVERFLOW_CHECKS: 1
325325
os: macos-13
326-
- name: dist-x86_64-apple-alt
327-
env:
328-
SCRIPT: "./x.py dist bootstrap --include-default-paths"
329-
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
330-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
331-
MACOSX_DEPLOYMENT_TARGET: 10.7
332-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
333-
NO_LLVM_ASSERTIONS: 1
334-
NO_DEBUG_ASSERTIONS: 1
335-
NO_OVERFLOW_CHECKS: 1
336-
os: macos-13
337326
- name: x86_64-apple-1
338327
env:
339328
SCRIPT: "./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps"

src/ci/github-actions/ci.yml

-12
Original file line numberDiff line numberDiff line change
@@ -504,18 +504,6 @@ jobs:
504504
NO_OVERFLOW_CHECKS: 1
505505
<<: *job-macos-xl
506506

507-
- name: dist-x86_64-apple-alt
508-
env:
509-
SCRIPT: ./x.py dist bootstrap --include-default-paths
510-
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false
511-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
512-
MACOSX_DEPLOYMENT_TARGET: 10.7
513-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
514-
NO_LLVM_ASSERTIONS: 1
515-
NO_DEBUG_ASSERTIONS: 1
516-
NO_OVERFLOW_CHECKS: 1
517-
<<: *job-macos-xl
518-
519507
- name: x86_64-apple-1
520508
env: &env-x86_64-apple-tests
521509
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps

0 commit comments

Comments
 (0)