Skip to content

Commit 9fa819e

Browse files
committed
Update deployment target setup in jobs.yml
Note that specifying MACOSX_STD_DEPLOYMENT_TARGET is still completely unnecessary here, but it's nice to have for future changes where we might want to version `std` and `rustc`'s deployment target separately.
1 parent 0a3fd1f commit 9fa819e

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/ci/github-actions/jobs.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ envs:
5959
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
6060
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
6161
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
62+
# Ensure that host tooling is tested on our minimum supported macOS version.
6263
MACOSX_DEPLOYMENT_TARGET: 10.12
6364
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
6465
SELECT_XCODE: /Applications/Xcode_15.2.app
@@ -370,7 +371,9 @@ auto:
370371
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
371372
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
372373
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
374+
# Ensure that host tooling is built to support our minimum support macOS version.
373375
MACOSX_DEPLOYMENT_TARGET: 10.12
376+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
374377
SELECT_XCODE: /Applications/Xcode_15.2.app
375378
NO_LLVM_ASSERTIONS: 1
376379
NO_DEBUG_ASSERTIONS: 1
@@ -386,7 +389,10 @@ auto:
386389
# https://github.com/rust-lang/rust/issues/129069
387390
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
388391
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
392+
# Ensure that host tooling is built to support our minimum support macOS version.
393+
# FIXME(madsmtm): This might be redundant, as we're not building host tooling here (?)
389394
MACOSX_DEPLOYMENT_TARGET: 10.12
395+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
390396
SELECT_XCODE: /Applications/Xcode_15.2.app
391397
NO_LLVM_ASSERTIONS: 1
392398
NO_DEBUG_ASSERTIONS: 1
@@ -404,7 +410,6 @@ auto:
404410
<<: *env-x86_64-apple-tests
405411
<<: *job-macos-xl
406412

407-
# This target only needs to support 11.0 and up as nothing else supports the hardware
408413
- name: dist-aarch64-apple
409414
env:
410415
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
@@ -419,6 +424,8 @@ auto:
419424
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
420425
SELECT_XCODE: /Applications/Xcode_15.4.app
421426
USE_XCODE_CLANG: 1
427+
# Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
428+
# supports the hardware.
422429
MACOSX_DEPLOYMENT_TARGET: 11.0
423430
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
424431
NO_LLVM_ASSERTIONS: 1
@@ -428,7 +435,6 @@ auto:
428435
CODEGEN_BACKENDS: llvm,cranelift
429436
<<: *job-macos-m1
430437

431-
# This target only needs to support 11.0 and up as nothing else supports the hardware
432438
- name: aarch64-apple
433439
env:
434440
SCRIPT: ./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin
@@ -439,6 +445,8 @@ auto:
439445
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
440446
SELECT_XCODE: /Applications/Xcode_15.4.app
441447
USE_XCODE_CLANG: 1
448+
# Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
449+
# supports the hardware, so only need to test it there.
442450
MACOSX_DEPLOYMENT_TARGET: 11.0
443451
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
444452
NO_LLVM_ASSERTIONS: 1

0 commit comments

Comments
 (0)