Skip to content

Commit 437be25

Browse files
committed
Auto merge of rust-lang#131570 - ehuss:update-xcode, r=Mark-Simulacrum
(ci) Update macOS Xcode to 15 This updates the macOS builders to Xcode 15. The aarch64 images will be removing Xcode 14 and 16 very soon (actions/runner-images#10703), so we will need to make the switch to continue operating. The linked issue also documents GitHub's new policy for how they will be updating Xcode in the future. Also worth being aware of is the future plans for x86 runners documented in actions/runner-images#9255 and actions/runner-images#10686, which will impact our future upgrade behaviors. I decided to also update the Xcode in the x86_64 runners, even though they are not being removed. It felt better to me to have all macOS runners on the same (major) version of Xcode. However, note that the x86_64 runners do not have the latest version of 15 (15.4), so I left them at 15.2 (which is currently the default Xcode of the runner). Xcode 15 was previously causing problems (see rust-lang#121058) which seem to be resolved now. `@bjorn3` fixed the `invalid r_symbolnum` issue with cranelift. The issue with clang failing to link seems to be fixed, possibly by the update of the pre-built LLVM from 14 to llvm 15 in rust-lang#124850, or an update in our source version of LLVM. I have run some try builds and at least LLVM seems to build (I did not run any tests). Closes rust-lang#121058
2 parents 798fb83 + 94579ff commit 437be25

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/ci/github-actions/jobs.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ envs:
4646
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
4747
MACOSX_DEPLOYMENT_TARGET: 10.12
4848
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
49-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
49+
SELECT_XCODE: /Applications/Xcode_15.2.app
5050
NO_LLVM_ASSERTIONS: 1
5151
NO_DEBUG_ASSERTIONS: 1
5252
NO_OVERFLOW_CHECKS: 1
@@ -282,7 +282,7 @@ auto:
282282
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
283283
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
284284
MACOSX_DEPLOYMENT_TARGET: 10.12
285-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
285+
SELECT_XCODE: /Applications/Xcode_15.2.app
286286
NO_LLVM_ASSERTIONS: 1
287287
NO_DEBUG_ASSERTIONS: 1
288288
NO_OVERFLOW_CHECKS: 1
@@ -298,7 +298,7 @@ auto:
298298
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc --set target.aarch64-apple-ios-macabi.sanitizers=false --set target.x86_64-apple-ios-macabi.sanitizers=false
299299
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
300300
MACOSX_DEPLOYMENT_TARGET: 10.12
301-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
301+
SELECT_XCODE: /Applications/Xcode_15.2.app
302302
NO_LLVM_ASSERTIONS: 1
303303
NO_DEBUG_ASSERTIONS: 1
304304
NO_OVERFLOW_CHECKS: 1
@@ -327,7 +327,7 @@ auto:
327327
--set llvm.ninja=false
328328
--set rust.lto=thin
329329
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
330-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
330+
SELECT_XCODE: /Applications/Xcode_15.4.app
331331
USE_XCODE_CLANG: 1
332332
MACOSX_DEPLOYMENT_TARGET: 11.0
333333
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
@@ -347,7 +347,7 @@ auto:
347347
--enable-profiler
348348
--set rust.jemalloc
349349
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
350-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
350+
SELECT_XCODE: /Applications/Xcode_15.4.app
351351
USE_XCODE_CLANG: 1
352352
MACOSX_DEPLOYMENT_TARGET: 11.0
353353
MACOSX_STD_DEPLOYMENT_TARGET: 11.0

0 commit comments

Comments
 (0)