Skip to content

Commit 533019d

Browse files
ehusscuviper
authored andcommitted
Downgrade Xcode from the default (15.0) to 14.3.1.
This seems to fix two sporadic errors that have been appearing in CI. One is an issue with cmake being unable to verify that cmake is able to build a simple test program. The other is a `invalid r_symbolnum` linking error when trying to build one of cranelift's tests. This is intended as a temporary fix until we can figure out how to resolve those issues. (cherry picked from commit 4fd3cf9)
1 parent a686e61 commit 533019d

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.github/workflows/ci.yml

+5-3
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 --stage 2"
368370
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"
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

src/ci/github-actions/ci.yml

+4-3
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
@@ -566,7 +567,7 @@ jobs:
566567
--disable-docs
567568
--set rust.jemalloc
568569
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
569-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
570+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
570571
USE_XCODE_CLANG: 1
571572
MACOSX_DEPLOYMENT_TARGET: 11.0
572573
MACOSX_STD_DEPLOYMENT_TARGET: 11.0

0 commit comments

Comments
 (0)