Skip to content

Commit cda219e

Browse files
committed
Use XCode 13.4 everywhere in dist CI
Do this because XCode 14 no longer supports a macOS deployment target of anything before 10.13. We need 10.7+(-ish, really 10.9+) for now.
1 parent c46987b commit cda219e

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Diff for: .github/workflows/ci.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ jobs:
304304
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
305305
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
306306
MACOSX_DEPLOYMENT_TARGET: 10.7
307+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
307308
NO_LLVM_ASSERTIONS: 1
308309
NO_DEBUG_ASSERTIONS: 1
309310
NO_OVERFLOW_CHECKS: 1
@@ -315,6 +316,7 @@ jobs:
315316
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
316317
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
317318
MACOSX_DEPLOYMENT_TARGET: 10.7
319+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
318320
NO_LLVM_ASSERTIONS: 1
319321
NO_DEBUG_ASSERTIONS: 1
320322
NO_OVERFLOW_CHECKS: 1
@@ -325,6 +327,7 @@ jobs:
325327
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
326328
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
327329
MACOSX_DEPLOYMENT_TARGET: 10.7
330+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
328331
NO_LLVM_ASSERTIONS: 1
329332
NO_DEBUG_ASSERTIONS: 1
330333
NO_OVERFLOW_CHECKS: 1
@@ -356,7 +359,7 @@ jobs:
356359
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
357360
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --disable-docs --set rust.jemalloc --set llvm.ninja=false"
358361
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
359-
SELECT_XCODE: /Applications/Xcode_12.2.app
362+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
360363
USE_XCODE_CLANG: 1
361364
MACOSX_DEPLOYMENT_TARGET: 11.0
362365
MACOSX_STD_DEPLOYMENT_TARGET: 11.0

Diff for: src/ci/github-actions/ci.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,7 @@ jobs:
470470
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
471471
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
472472
MACOSX_DEPLOYMENT_TARGET: 10.7
473+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
473474
NO_LLVM_ASSERTIONS: 1
474475
NO_DEBUG_ASSERTIONS: 1
475476
NO_OVERFLOW_CHECKS: 1
@@ -482,6 +483,7 @@ jobs:
482483
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
483484
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
484485
MACOSX_DEPLOYMENT_TARGET: 10.7
486+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
485487
NO_LLVM_ASSERTIONS: 1
486488
NO_DEBUG_ASSERTIONS: 1
487489
NO_OVERFLOW_CHECKS: 1
@@ -493,6 +495,7 @@ jobs:
493495
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false
494496
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
495497
MACOSX_DEPLOYMENT_TARGET: 10.7
498+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
496499
NO_LLVM_ASSERTIONS: 1
497500
NO_DEBUG_ASSERTIONS: 1
498501
NO_OVERFLOW_CHECKS: 1
@@ -531,7 +534,7 @@ jobs:
531534
--set rust.jemalloc
532535
--set llvm.ninja=false
533536
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
534-
SELECT_XCODE: /Applications/Xcode_12.2.app
537+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
535538
USE_XCODE_CLANG: 1
536539
MACOSX_DEPLOYMENT_TARGET: 11.0
537540
MACOSX_STD_DEPLOYMENT_TARGET: 11.0

0 commit comments

Comments
 (0)