Skip to content

Commit 85502fc

Browse files
committed
Test dist-apple-various
1 parent 673b519 commit 85502fc

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

src/ci/github-actions/jobs.yml

+15-13
Original file line numberDiff line numberDiff line change
@@ -100,20 +100,22 @@ envs:
100100
# These jobs automatically inherit envs.pr, to avoid repeating
101101
# it in each job definition.
102102
pr:
103-
- name: mingw-check
104-
<<: *job-linux-4c
105-
- name: mingw-check-tidy
106-
continue_on_error: true
107-
<<: *job-linux-4c
108-
- name: x86_64-gnu-llvm-18
103+
- name: dist-apple-various
109104
env:
110-
ENABLE_GCC_CODEGEN: "1"
111-
# We are adding (temporarily) a dummy commit on the compiler
112-
READ_ONLY_SRC: "0"
113-
DOCKER_SCRIPT: x86_64-gnu-llvm.sh
114-
<<: *job-linux-16c
115-
- name: x86_64-gnu-tools
116-
<<: *job-linux-16c
105+
SCRIPT: ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim,aarch64-apple-ios-macabi,x86_64-apple-ios-macabi
106+
# Mac Catalyst cannot currently compile the sanitizer:
107+
# https://github.com/rust-lang/rust/issues/129069
108+
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc --set target.aarch64-apple-ios-macabi.sanitizers=false --set target.x86_64-apple-ios-macabi.sanitizers=false
109+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
110+
# Ensure that host tooling is built to support our minimum support macOS version.
111+
# FIXME(madsmtm): This might be redundant, as we're not building host tooling here (?)
112+
MACOSX_DEPLOYMENT_TARGET: 10.12
113+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
114+
SELECT_XCODE: /Applications/Xcode_15.2.app
115+
NO_LLVM_ASSERTIONS: 1
116+
NO_DEBUG_ASSERTIONS: 1
117+
NO_OVERFLOW_CHECKS: 1
118+
<<: *job-macos-xl
117119

118120
# Jobs that run when you perform a try build (@bors try)
119121
# These jobs automatically inherit envs.try, to avoid repeating

0 commit comments

Comments
 (0)