Remove duplicate macOS builders
This commit is contained in:
parent
2c69266c06
commit
15adc2ee83
29
.github/workflows/ci.yml
vendored
29
.github/workflows/ci.yml
vendored
@ -404,35 +404,6 @@ jobs:
|
|||||||
NO_LLVM_ASSERTIONS: 1
|
NO_LLVM_ASSERTIONS: 1
|
||||||
NO_DEBUG_ASSERTIONS: 1
|
NO_DEBUG_ASSERTIONS: 1
|
||||||
os: macos-latest
|
os: macos-latest
|
||||||
- name: dist-x86_64-apple
|
|
||||||
env:
|
|
||||||
SCRIPT: "./x.py dist"
|
|
||||||
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"
|
|
||||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
|
||||||
MACOSX_DEPLOYMENT_TARGET: 10.7
|
|
||||||
NO_LLVM_ASSERTIONS: 1
|
|
||||||
NO_DEBUG_ASSERTIONS: 1
|
|
||||||
DIST_REQUIRE_ALL_TOOLS: 1
|
|
||||||
os: macos-latest
|
|
||||||
- name: dist-x86_64-apple-alt
|
|
||||||
env:
|
|
||||||
SCRIPT: "./x.py dist"
|
|
||||||
RUST_CONFIGURE_ARGS: "--enable-extended --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
|
|
||||||
os: macos-latest
|
|
||||||
- name: x86_64-apple
|
|
||||||
env:
|
|
||||||
SCRIPT: "./x.py --stage 2 test"
|
|
||||||
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
|
|
||||||
os: macos-latest
|
|
||||||
- name: x86_64-msvc-1
|
- name: x86_64-msvc-1
|
||||||
env:
|
env:
|
||||||
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
|
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
|
||||||
|
@ -436,42 +436,6 @@ jobs:
|
|||||||
# macOS Builders #
|
# macOS Builders #
|
||||||
####################
|
####################
|
||||||
|
|
||||||
- name: dist-x86_64-apple
|
|
||||||
env:
|
|
||||||
SCRIPT: ./x.py dist
|
|
||||||
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
|
|
||||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
|
||||||
MACOSX_DEPLOYMENT_TARGET: 10.7
|
|
||||||
NO_LLVM_ASSERTIONS: 1
|
|
||||||
NO_DEBUG_ASSERTIONS: 1
|
|
||||||
DIST_REQUIRE_ALL_TOOLS: 1
|
|
||||||
<<: *job-macos-xl
|
|
||||||
|
|
||||||
- name: dist-x86_64-apple-alt
|
|
||||||
env:
|
|
||||||
SCRIPT: ./x.py dist
|
|
||||||
RUST_CONFIGURE_ARGS: --enable-extended --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
|
|
||||||
<<: *job-macos-xl
|
|
||||||
|
|
||||||
- name: x86_64-apple
|
|
||||||
env:
|
|
||||||
SCRIPT: ./x.py --stage 2 test
|
|
||||||
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
|
|
||||||
<<: *job-macos-xl
|
|
||||||
|
|
||||||
####################
|
|
||||||
# macOS Builders #
|
|
||||||
####################
|
|
||||||
|
|
||||||
- name: dist-x86_64-apple
|
- name: dist-x86_64-apple
|
||||||
env:
|
env:
|
||||||
SCRIPT: ./x.py dist
|
SCRIPT: ./x.py dist
|
||||||
|
Loading…
Reference in New Issue
Block a user