Skip to content

Commit 8956907

Browse files
committed
Extract common macOS x86_64 target environment
1 parent f66a8e0 commit 8956907

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/ci/github-actions/jobs.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ envs:
9494
SELECT_XCODE: /Applications/Xcode_15.4.app
9595
USE_XCODE_CLANG: 1
9696

97+
# Ensure that host tooling is tested on our minimum supported macOS
98+
# version.
99+
env-macos-x86_64-target: &env-macos-x86_64-target
100+
MACOSX_DEPLOYMENT_TARGET: 10.12
101+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
102+
97103
jobs:
98104
dist-x86_64-linux: &job-dist-x86_64-linux
99105
name: dist-x86_64-linux
@@ -431,10 +437,7 @@ auto:
431437
--set rust.jemalloc
432438
--set rust.lto=thin
433439
--set rust.codegen-units=1
434-
# Ensure that host tooling is built to support our minimum support macOS version.
435-
MACOSX_DEPLOYMENT_TARGET: 10.12
436-
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
437-
<<: *env-macos-xcode
440+
<<: [*env-macos-x86_64-target, *env-macos-xcode]
438441
DIST_REQUIRE_ALL_TOOLS: 1
439442
CODEGEN_BACKENDS: llvm,cranelift
440443
<<: *job-macos
@@ -445,11 +448,8 @@ auto:
445448
# Mac Catalyst cannot currently compile the sanitizer:
446449
# https://github.com/rust-lang/rust/issues/129069
447450
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
448-
# Ensure that host tooling is built to support our minimum support macOS version.
449-
# FIXME(madsmtm): This might be redundant, as we're not building host tooling here (?)
450-
MACOSX_DEPLOYMENT_TARGET: 10.12
451-
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
452-
<<: *env-macos-xcode
451+
# FIXME(madsmtm): Setting the target might be redundant, as we're not building host tooling here (?)
452+
<<: [*env-macos-x86_64-target, *env-macos-xcode]
453453
<<: *job-macos
454454

455455
- name: dist-aarch64-apple

0 commit comments

Comments
 (0)