Skip to content

Commit f66a8e0

Browse files
committed
Extract common macOS XCode environment
1 parent 40219a8 commit f66a8e0

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/ci/github-actions/jobs.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ envs:
9090
pr:
9191
PR_CI_JOB: 1
9292

93+
env-macos-xcode: &env-macos-xcode
94+
SELECT_XCODE: /Applications/Xcode_15.4.app
95+
USE_XCODE_CLANG: 1
96+
9397
jobs:
9498
dist-x86_64-linux: &job-dist-x86_64-linux
9599
name: dist-x86_64-linux
@@ -430,8 +434,7 @@ auto:
430434
# Ensure that host tooling is built to support our minimum support macOS version.
431435
MACOSX_DEPLOYMENT_TARGET: 10.12
432436
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
433-
SELECT_XCODE: /Applications/Xcode_15.4.app
434-
USE_XCODE_CLANG: 1
437+
<<: *env-macos-xcode
435438
DIST_REQUIRE_ALL_TOOLS: 1
436439
CODEGEN_BACKENDS: llvm,cranelift
437440
<<: *job-macos
@@ -446,8 +449,7 @@ auto:
446449
# FIXME(madsmtm): This might be redundant, as we're not building host tooling here (?)
447450
MACOSX_DEPLOYMENT_TARGET: 10.12
448451
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
449-
SELECT_XCODE: /Applications/Xcode_15.4.app
450-
USE_XCODE_CLANG: 1
452+
<<: *env-macos-xcode
451453
<<: *job-macos
452454

453455
- name: dist-aarch64-apple
@@ -468,8 +470,7 @@ auto:
468470
# supports the hardware.
469471
MACOSX_DEPLOYMENT_TARGET: 11.0
470472
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
471-
SELECT_XCODE: /Applications/Xcode_15.4.app
472-
USE_XCODE_CLANG: 1
473+
<<: *env-macos-xcode
473474
DIST_REQUIRE_ALL_TOOLS: 1
474475
CODEGEN_BACKENDS: llvm,cranelift
475476
<<: *job-macos
@@ -483,12 +484,11 @@ auto:
483484
--enable-sanitizers
484485
--enable-profiler
485486
--set rust.jemalloc
486-
SELECT_XCODE: /Applications/Xcode_15.4.app
487-
USE_XCODE_CLANG: 1
488487
# Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
489488
# supports the hardware, so only need to test it there.
490489
MACOSX_DEPLOYMENT_TARGET: 11.0
491490
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
491+
<<: *env-macos-xcode
492492
<<: *job-macos
493493

494494
######################

0 commit comments

Comments
 (0)