Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 49475a6

Browse files
ehussehuss
committed
Run more in parallel
1 parent 7bc2f5e commit 49475a6

File tree

2 files changed

+136
-3
lines changed

2 files changed

+136
-3
lines changed

‎.github/workflows/ci.yml

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,9 +487,69 @@ jobs:
487487
NO_DEBUG_ASSERTIONS: 1
488488
NO_OVERFLOW_CHECKS: 1
489489
os: macos-13
490+
- name: dist-x86_64-apple-2
491+
env:
492+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
493+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin"
494+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
495+
MACOSX_DEPLOYMENT_TARGET: 10.12
496+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
497+
NO_LLVM_ASSERTIONS: 1
498+
NO_DEBUG_ASSERTIONS: 1
499+
NO_OVERFLOW_CHECKS: 1
500+
DIST_REQUIRE_ALL_TOOLS: 1
501+
CODEGEN_BACKENDS: "llvm,cranelift"
502+
os: macos-13
503+
- name: dist-apple-various-2
504+
env:
505+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
506+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
507+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
508+
MACOSX_DEPLOYMENT_TARGET: 10.12
509+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
510+
NO_LLVM_ASSERTIONS: 1
511+
NO_DEBUG_ASSERTIONS: 1
512+
NO_OVERFLOW_CHECKS: 1
513+
os: macos-13
490514
- name: x86_64-apple-2
491515
env:
492-
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
516+
SCRIPT: "./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps"
517+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
518+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
519+
MACOSX_DEPLOYMENT_TARGET: 10.12
520+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
521+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
522+
NO_LLVM_ASSERTIONS: 1
523+
NO_DEBUG_ASSERTIONS: 1
524+
NO_OVERFLOW_CHECKS: 1
525+
os: macos-13
526+
- name: dist-x86_64-apple-3
527+
env:
528+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
529+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin"
530+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
531+
MACOSX_DEPLOYMENT_TARGET: 10.12
532+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
533+
NO_LLVM_ASSERTIONS: 1
534+
NO_DEBUG_ASSERTIONS: 1
535+
NO_OVERFLOW_CHECKS: 1
536+
DIST_REQUIRE_ALL_TOOLS: 1
537+
CODEGEN_BACKENDS: "llvm,cranelift"
538+
os: macos-13
539+
- name: dist-apple-various-3
540+
env:
541+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
542+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
543+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
544+
MACOSX_DEPLOYMENT_TARGET: 10.12
545+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
546+
NO_LLVM_ASSERTIONS: 1
547+
NO_DEBUG_ASSERTIONS: 1
548+
NO_OVERFLOW_CHECKS: 1
549+
os: macos-13
550+
- name: x86_64-apple-3
551+
env:
552+
SCRIPT: "./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps"
493553
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
494554
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
495555
MACOSX_DEPLOYMENT_TARGET: 10.12

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

Lines changed: 75 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -772,12 +772,85 @@ jobs:
772772
NO_OVERFLOW_CHECKS: 1
773773
<<: *job-macos-xl
774774

775+
- name: dist-x86_64-apple-2
776+
env:
777+
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
778+
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin
779+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
780+
MACOSX_DEPLOYMENT_TARGET: 10.12
781+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
782+
NO_LLVM_ASSERTIONS: 1
783+
NO_DEBUG_ASSERTIONS: 1
784+
NO_OVERFLOW_CHECKS: 1
785+
DIST_REQUIRE_ALL_TOOLS: 1
786+
CODEGEN_BACKENDS: llvm,cranelift
787+
<<: *job-macos-xl
788+
789+
- name: dist-apple-various-2
790+
env:
791+
SCRIPT: ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
792+
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc
793+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
794+
MACOSX_DEPLOYMENT_TARGET: 10.12
795+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
796+
NO_LLVM_ASSERTIONS: 1
797+
NO_DEBUG_ASSERTIONS: 1
798+
NO_OVERFLOW_CHECKS: 1
799+
<<: *job-macos-xl
800+
775801
- name: x86_64-apple-2
802+
env: &env-x86_64-apple-tests
803+
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
804+
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
805+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
806+
MACOSX_DEPLOYMENT_TARGET: 10.12
807+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
808+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
809+
NO_LLVM_ASSERTIONS: 1
810+
NO_DEBUG_ASSERTIONS: 1
811+
NO_OVERFLOW_CHECKS: 1
812+
<<: *job-macos-xl
813+
814+
- name: dist-x86_64-apple-3
776815
env:
777-
SCRIPT: ./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps
778-
<<: *env-x86_64-apple-tests
816+
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
817+
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin
818+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
819+
MACOSX_DEPLOYMENT_TARGET: 10.12
820+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
821+
NO_LLVM_ASSERTIONS: 1
822+
NO_DEBUG_ASSERTIONS: 1
823+
NO_OVERFLOW_CHECKS: 1
824+
DIST_REQUIRE_ALL_TOOLS: 1
825+
CODEGEN_BACKENDS: llvm,cranelift
826+
<<: *job-macos-xl
827+
828+
- name: dist-apple-various-3
829+
env:
830+
SCRIPT: ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
831+
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc
832+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
833+
MACOSX_DEPLOYMENT_TARGET: 10.12
834+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
835+
NO_LLVM_ASSERTIONS: 1
836+
NO_DEBUG_ASSERTIONS: 1
837+
NO_OVERFLOW_CHECKS: 1
838+
<<: *job-macos-xl
839+
840+
- name: x86_64-apple-3
841+
env: &env-x86_64-apple-tests
842+
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
843+
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
844+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
845+
MACOSX_DEPLOYMENT_TARGET: 10.12
846+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
847+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
848+
NO_LLVM_ASSERTIONS: 1
849+
NO_DEBUG_ASSERTIONS: 1
850+
NO_OVERFLOW_CHECKS: 1
779851
<<: *job-macos-xl
780852

853+
781854
master:
782855
name: master
783856
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)