Skip to content

Commit 5a9eb75

Browse files
committed
Extract common macOS aarch64 target environment
1 parent 8956907 commit 5a9eb75

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

src/ci/github-actions/jobs.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,12 @@ envs:
100100
MACOSX_DEPLOYMENT_TARGET: 10.12
101101
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
102102

103+
# Aarch64 tooling only needs to support macOS 11.0 as this is the
104+
# first OS version to support the hardware.
105+
env-macos-aarch64-target: &env-macos-aarch64-target
106+
MACOSX_DEPLOYMENT_TARGET: 11.0
107+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
108+
103109
jobs:
104110
dist-x86_64-linux: &job-dist-x86_64-linux
105111
name: dist-x86_64-linux
@@ -466,11 +472,7 @@ auto:
466472
--set rust.jemalloc
467473
--set rust.lto=thin
468474
--set rust.codegen-units=1
469-
# Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
470-
# supports the hardware.
471-
MACOSX_DEPLOYMENT_TARGET: 11.0
472-
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
473-
<<: *env-macos-xcode
475+
<<: [*env-macos-aarch64-target, *env-macos-xcode]
474476
DIST_REQUIRE_ALL_TOOLS: 1
475477
CODEGEN_BACKENDS: llvm,cranelift
476478
<<: *job-macos
@@ -484,11 +486,7 @@ auto:
484486
--enable-sanitizers
485487
--enable-profiler
486488
--set rust.jemalloc
487-
# Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
488-
# supports the hardware, so only need to test it there.
489-
MACOSX_DEPLOYMENT_TARGET: 11.0
490-
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
491-
<<: *env-macos-xcode
489+
<<: [*env-macos-aarch64-target, *env-macos-xcode]
492490
<<: *job-macos
493491

494492
######################

0 commit comments

Comments
 (0)