Skip to content

Commit 899c895

Browse files
borsbors
committed
Auto merge of #120914 - ehuss:downgrade-xcode, r=Mark-Simulacrum
Downgrade xcode This is a temporary fix for the CI issues that have been plaguing the macOS builders. GitHub updated the default Xcode to 15 in the [2024-02-04](https://github.com/actions/runner-images/releases/tag/macos-13%2F20240204.1) update. This caused two issues to start appearing in CI: * cmake fails to verify that clang can build a simple test program. * An `invalid r_symbolnum` linking error when trying to build one of cranelift's tests. I believe I have a solution for the first problem, but not the second. In the meantime, to help with the CI problems, this PR should temporarily resolve the issue until we have a solution.
2 parents 9aa232e + 4ce1f1c commit 899c895

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

‎.github/workflows/ci.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ jobs:
322322
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin"
323323
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
324324
MACOSX_DEPLOYMENT_TARGET: 10.12
325-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
325+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
326326
NO_LLVM_ASSERTIONS: 1
327327
NO_DEBUG_ASSERTIONS: 1
328328
NO_OVERFLOW_CHECKS: 1
@@ -335,7 +335,7 @@ jobs:
335335
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
336336
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
337337
MACOSX_DEPLOYMENT_TARGET: 10.12
338-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
338+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
339339
NO_LLVM_ASSERTIONS: 1
340340
NO_DEBUG_ASSERTIONS: 1
341341
NO_OVERFLOW_CHECKS: 1
@@ -347,6 +347,7 @@ jobs:
347347
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
348348
MACOSX_DEPLOYMENT_TARGET: 10.12
349349
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
350+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
350351
NO_LLVM_ASSERTIONS: 1
351352
NO_DEBUG_ASSERTIONS: 1
352353
NO_OVERFLOW_CHECKS: 1
@@ -358,6 +359,7 @@ jobs:
358359
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
359360
MACOSX_DEPLOYMENT_TARGET: 10.12
360361
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
362+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
361363
NO_LLVM_ASSERTIONS: 1
362364
NO_DEBUG_ASSERTIONS: 1
363365
NO_OVERFLOW_CHECKS: 1
@@ -367,7 +369,7 @@ jobs:
367369
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
368370
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
369371
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
370-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
372+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
371373
USE_XCODE_CLANG: 1
372374
MACOSX_DEPLOYMENT_TARGET: 11.0
373375
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
@@ -381,7 +383,7 @@ jobs:
381383
SCRIPT: "./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
382384
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
383385
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
384-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
386+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
385387
USE_XCODE_CLANG: 1
386388
MACOSX_DEPLOYMENT_TARGET: 11.0
387389
MACOSX_STD_DEPLOYMENT_TARGET: 11.0

‎src/ci/github-actions/ci.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ jobs:
514514
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin
515515
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
516516
MACOSX_DEPLOYMENT_TARGET: 10.12
517-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
517+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
518518
NO_LLVM_ASSERTIONS: 1
519519
NO_DEBUG_ASSERTIONS: 1
520520
NO_OVERFLOW_CHECKS: 1
@@ -528,7 +528,7 @@ jobs:
528528
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc
529529
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
530530
MACOSX_DEPLOYMENT_TARGET: 10.12
531-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
531+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
532532
NO_LLVM_ASSERTIONS: 1
533533
NO_DEBUG_ASSERTIONS: 1
534534
NO_OVERFLOW_CHECKS: 1
@@ -541,6 +541,7 @@ jobs:
541541
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
542542
MACOSX_DEPLOYMENT_TARGET: 10.12
543543
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
544+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
544545
NO_LLVM_ASSERTIONS: 1
545546
NO_DEBUG_ASSERTIONS: 1
546547
NO_OVERFLOW_CHECKS: 1
@@ -564,7 +565,7 @@ jobs:
564565
--set llvm.ninja=false
565566
--set rust.lto=thin
566567
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
567-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
568+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
568569
USE_XCODE_CLANG: 1
569570
MACOSX_DEPLOYMENT_TARGET: 11.0
570571
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
@@ -583,7 +584,7 @@ jobs:
583584
--enable-profiler
584585
--set rust.jemalloc
585586
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
586-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
587+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
587588
USE_XCODE_CLANG: 1
588589
MACOSX_DEPLOYMENT_TARGET: 11.0
589590
MACOSX_STD_DEPLOYMENT_TARGET: 11.0

‎src/ci/scripts/select-xcode.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@ IFS=$'\n\t'
77
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
88

99
if isMacOS; then
10-
if [[ -s "${SELECT_XCODE-}" ]]; then
11-
sudo xcode-select -s "${SELECT_XCODE}"
12-
fi
10+
sudo xcode-select -s "${SELECT_XCODE}"
1311
fi

0 commit comments

Comments
 (0)