@@ -733,22 +733,64 @@ jobs:
733733 strategy :
734734 matrix :
735735 include :
736- - name : dist-x86_64-apple
736+ # - name: dist-x86_64-apple
737+ # env:
738+ # SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
739+ # RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin
740+ # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
741+ # MACOSX_DEPLOYMENT_TARGET: 10.12
742+ # SELECT_XCODE: /Applications/Xcode_15.2.app
743+ # USE_XCODE_CLANG: 1
744+ # NO_LLVM_ASSERTIONS: 1
745+ # NO_DEBUG_ASSERTIONS: 1
746+ # NO_OVERFLOW_CHECKS: 1
747+ # DIST_REQUIRE_ALL_TOOLS: 1
748+ # CODEGEN_BACKENDS: llvm,cranelift
749+ # <<: *job-macos-xl
750+
751+ - name : dist-apple-various
737752 env :
738- SCRIPT : ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
739- RUST_CONFIGURE_ARGS : --enable-full-tools --enable- sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin
753+ SCRIPT : ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios, x86_64-apple-ios,aarch64-apple-ios-sim
754+ RUST_CONFIGURE_ARGS : --enable-sanitizers --enable-profiler --set rust.jemalloc
740755 RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
741756 MACOSX_DEPLOYMENT_TARGET : 10.12
742757 SELECT_XCODE : /Applications/Xcode_15.2.app
743758 USE_XCODE_CLANG : 1
744759 NO_LLVM_ASSERTIONS : 1
745760 NO_DEBUG_ASSERTIONS : 1
746761 NO_OVERFLOW_CHECKS : 1
747- DIST_REQUIRE_ALL_TOOLS : 1
748- CODEGEN_BACKENDS : llvm,cranelift
749762 << : *job-macos-xl
750763
751- - name : dist-apple-various
764+ # - name: x86_64-apple-1
765+ # env: &env-x86_64-apple-tests
766+ # SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
767+ # RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
768+ # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
769+ # MACOSX_DEPLOYMENT_TARGET: 10.12
770+ # MACOSX_STD_DEPLOYMENT_TARGET: 10.12
771+ # SELECT_XCODE: /Applications/Xcode_15.2.app
772+ # USE_XCODE_CLANG: 1
773+ # NO_LLVM_ASSERTIONS: 1
774+ # NO_DEBUG_ASSERTIONS: 1
775+ # NO_OVERFLOW_CHECKS: 1
776+ # <<: *job-macos-xl
777+
778+ # - name: dist-x86_64-apple-2
779+ # env:
780+ # SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
781+ # RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin
782+ # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
783+ # MACOSX_DEPLOYMENT_TARGET: 10.12
784+ # SELECT_XCODE: /Applications/Xcode_15.2.app
785+ # USE_XCODE_CLANG: 1
786+ # NO_LLVM_ASSERTIONS: 1
787+ # NO_DEBUG_ASSERTIONS: 1
788+ # NO_OVERFLOW_CHECKS: 1
789+ # DIST_REQUIRE_ALL_TOOLS: 1
790+ # CODEGEN_BACKENDS: llvm,cranelift
791+ # <<: *job-macos-xl
792+
793+ - name : dist-apple-various-2
752794 env :
753795 SCRIPT : ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
754796 RUST_CONFIGURE_ARGS : --enable-sanitizers --enable-profiler --set rust.jemalloc
@@ -761,36 +803,76 @@ jobs:
761803 NO_OVERFLOW_CHECKS : 1
762804 << : *job-macos-xl
763805
764- - name : x86_64-apple-1
765- env : &env-x86_64-apple-tests
766- SCRIPT : ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
767- RUST_CONFIGURE_ARGS : --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
806+ # - name: x86_64-apple-2
807+ # env: &env-x86_64-apple-tests
808+ # SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
809+ # RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
810+ # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
811+ # MACOSX_DEPLOYMENT_TARGET: 10.12
812+ # MACOSX_STD_DEPLOYMENT_TARGET: 10.12
813+ # SELECT_XCODE: /Applications/Xcode_15.2.app
814+ # USE_XCODE_CLANG: 1
815+ # NO_LLVM_ASSERTIONS: 1
816+ # NO_DEBUG_ASSERTIONS: 1
817+ # NO_OVERFLOW_CHECKS: 1
818+ # <<: *job-macos-xl
819+
820+ # - name: dist-x86_64-apple-3
821+ # env:
822+ # SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
823+ # RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin
824+ # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
825+ # MACOSX_DEPLOYMENT_TARGET: 10.12
826+ # SELECT_XCODE: /Applications/Xcode_15.2.app
827+ # USE_XCODE_CLANG: 1
828+ # NO_LLVM_ASSERTIONS: 1
829+ # NO_DEBUG_ASSERTIONS: 1
830+ # NO_OVERFLOW_CHECKS: 1
831+ # DIST_REQUIRE_ALL_TOOLS: 1
832+ # CODEGEN_BACKENDS: llvm,cranelift
833+ # <<: *job-macos-xl
834+
835+ - name : dist-apple-various-3
836+ env :
837+ SCRIPT : ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
838+ RUST_CONFIGURE_ARGS : --enable-sanitizers --enable-profiler --set rust.jemalloc
768839 RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
769840 MACOSX_DEPLOYMENT_TARGET : 10.12
770- MACOSX_STD_DEPLOYMENT_TARGET : 10.12
771841 SELECT_XCODE : /Applications/Xcode_15.2.app
772842 USE_XCODE_CLANG : 1
773843 NO_LLVM_ASSERTIONS : 1
774844 NO_DEBUG_ASSERTIONS : 1
775845 NO_OVERFLOW_CHECKS : 1
776846 << : *job-macos-xl
777847
778- - name : dist-x86_64-apple-2
848+ # - name: x86_64-apple-3
849+ # env: &env-x86_64-apple-tests
850+ # SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
851+ # RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
852+ # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
853+ # MACOSX_DEPLOYMENT_TARGET: 10.12
854+ # MACOSX_STD_DEPLOYMENT_TARGET: 10.12
855+ # SELECT_XCODE: /Applications/Xcode_15.2.app
856+ # USE_XCODE_CLANG: 1
857+ # NO_LLVM_ASSERTIONS: 1
858+ # NO_DEBUG_ASSERTIONS: 1
859+ # NO_OVERFLOW_CHECKS: 1
860+ # <<: *job-macos-xl
861+
862+ - name : dist-apple-various-4
779863 env :
780- SCRIPT : ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
781- RUST_CONFIGURE_ARGS : --enable-full-tools --enable- sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin
864+ SCRIPT : ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios, x86_64-apple-ios,aarch64-apple-ios-sim
865+ RUST_CONFIGURE_ARGS : --enable-sanitizers --enable-profiler --set rust.jemalloc
782866 RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
783867 MACOSX_DEPLOYMENT_TARGET : 10.12
784868 SELECT_XCODE : /Applications/Xcode_15.2.app
785869 USE_XCODE_CLANG : 1
786870 NO_LLVM_ASSERTIONS : 1
787871 NO_DEBUG_ASSERTIONS : 1
788872 NO_OVERFLOW_CHECKS : 1
789- DIST_REQUIRE_ALL_TOOLS : 1
790- CODEGEN_BACKENDS : llvm,cranelift
791873 << : *job-macos-xl
792874
793- - name : dist-apple-various-2
875+ - name : dist-apple-various-5
794876 env :
795877 SCRIPT : ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
796878 RUST_CONFIGURE_ARGS : --enable-sanitizers --enable-profiler --set rust.jemalloc
@@ -803,36 +885,33 @@ jobs:
803885 NO_OVERFLOW_CHECKS : 1
804886 << : *job-macos-xl
805887
806- - name : x86_64 -apple-2
807- env : &env-x86_64-apple-tests
808- SCRIPT : ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
809- RUST_CONFIGURE_ARGS : --build=x86_64-apple-darwin -- enable-sanitizers --enable-profiler --set rust.jemalloc
888+ - name : dist -apple-various-6
889+ env :
890+ SCRIPT : ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
891+ RUST_CONFIGURE_ARGS : --enable-sanitizers --enable-profiler --set rust.jemalloc
810892 RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
811893 MACOSX_DEPLOYMENT_TARGET : 10.12
812- MACOSX_STD_DEPLOYMENT_TARGET : 10.12
813894 SELECT_XCODE : /Applications/Xcode_15.2.app
814895 USE_XCODE_CLANG : 1
815896 NO_LLVM_ASSERTIONS : 1
816897 NO_DEBUG_ASSERTIONS : 1
817898 NO_OVERFLOW_CHECKS : 1
818899 << : *job-macos-xl
819900
820- - name : dist-x86_64- apple-3
901+ - name : dist-apple-various-7
821902 env :
822- SCRIPT : ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
823- RUST_CONFIGURE_ARGS : --enable-full-tools --enable- sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin
903+ SCRIPT : ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios, x86_64-apple-ios,aarch64-apple-ios-sim
904+ RUST_CONFIGURE_ARGS : --enable-sanitizers --enable-profiler --set rust.jemalloc
824905 RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
825906 MACOSX_DEPLOYMENT_TARGET : 10.12
826907 SELECT_XCODE : /Applications/Xcode_15.2.app
827908 USE_XCODE_CLANG : 1
828909 NO_LLVM_ASSERTIONS : 1
829910 NO_DEBUG_ASSERTIONS : 1
830911 NO_OVERFLOW_CHECKS : 1
831- DIST_REQUIRE_ALL_TOOLS : 1
832- CODEGEN_BACKENDS : llvm,cranelift
833912 << : *job-macos-xl
834913
835- - name : dist-apple-various-3
914+ - name : dist-apple-various-8
836915 env :
837916 SCRIPT : ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
838917 RUST_CONFIGURE_ARGS : --enable-sanitizers --enable-profiler --set rust.jemalloc
@@ -845,20 +924,31 @@ jobs:
845924 NO_OVERFLOW_CHECKS : 1
846925 << : *job-macos-xl
847926
848- - name : x86_64 -apple-3
849- env : &env-x86_64-apple-tests
850- SCRIPT : ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
851- RUST_CONFIGURE_ARGS : --build=x86_64-apple-darwin -- enable-sanitizers --enable-profiler --set rust.jemalloc
927+ - name : dist -apple-various-9
928+ env :
929+ SCRIPT : ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
930+ RUST_CONFIGURE_ARGS : --enable-sanitizers --enable-profiler --set rust.jemalloc
852931 RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
853932 MACOSX_DEPLOYMENT_TARGET : 10.12
854- MACOSX_STD_DEPLOYMENT_TARGET : 10.12
855933 SELECT_XCODE : /Applications/Xcode_15.2.app
856934 USE_XCODE_CLANG : 1
857935 NO_LLVM_ASSERTIONS : 1
858936 NO_DEBUG_ASSERTIONS : 1
859937 NO_OVERFLOW_CHECKS : 1
860938 << : *job-macos-xl
861939
940+ - name : dist-apple-various-10
941+ env :
942+ SCRIPT : ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
943+ RUST_CONFIGURE_ARGS : --enable-sanitizers --enable-profiler --set rust.jemalloc
944+ RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
945+ MACOSX_DEPLOYMENT_TARGET : 10.12
946+ SELECT_XCODE : /Applications/Xcode_15.2.app
947+ USE_XCODE_CLANG : 1
948+ NO_LLVM_ASSERTIONS : 1
949+ NO_DEBUG_ASSERTIONS : 1
950+ NO_OVERFLOW_CHECKS : 1
951+ << : *job-macos-xl
862952
863953 master :
864954 name : master
0 commit comments