Skip to content

Commit bc2e9f9

Browse files
authored
GHA main: Bump macos-14 job to macos-15 (#4782)
The arm64 macOS images have changed to support a single major Xcode version each; Xcode v16 isn't available for macos-14 anymore (only v15). So switch to the macos-15 image, with Xcode v16.
1 parent ad4372c commit bc2e9f9

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
with_pgo: true
5252

5353
- job_name: macOS arm64
54-
os: macos-14
54+
os: macos-15
5555
arch: arm64
5656
bootstrap_cmake_flags: >-
5757
-DBUILD_LTO_LIBS=ON
@@ -94,25 +94,22 @@ jobs:
9494
with:
9595
submodules: true
9696
fetch-depth: 50
97-
- name: 'macOS 14: Switch to Xcode 16'
98-
if: matrix.os == 'macos-14'
99-
run: sudo xcode-select -switch /Applications/Xcode_16.app
10097
- name: Install prerequisites
10198
uses: ./.github/actions/1-setup
10299
with:
103100
clang_version: ${{ runner.os == 'Windows' && '18.1.8' || env.CLANG_VERSION }}
104101
llvm_version: ${{ matrix.llvm_version || env.LLVM_VERSION }}
105102
arch: ${{ matrix.arch }}
106103
- name: Build bootstrap LDC
107-
if: matrix.os != 'macos-14'
104+
if: matrix.os != 'macos-15'
108105
uses: ./.github/actions/2-build-bootstrap
109106
with:
110107
cmake_flags: ${{ matrix.bootstrap_cmake_flags }}
111108
arch: ${{ matrix.arch }}
112109
# FIXME: on macOS arm64, LLVM 18 (from LDC) and LLVM 17 (from Xcode 16) seem incompatible,
113110
# leading to sporadic 'libc++abi: Pure virtual function called!' compiler crashes
114-
- name: 'macOS 14: Use host LDC (with Xcode-compatible LLVM version) as bootstrap LDC'
115-
if: matrix.os == 'macos-14'
111+
- name: 'macOS 15: Use host LDC (with Xcode-compatible LLVM version) as bootstrap LDC'
112+
if: matrix.os == 'macos-15'
116113
run: ln -s $(dirname $(dirname $(which ldmd2))) ../bootstrap-ldc
117114
- name: Build LDC with PGO instrumentation & gather profile from compiling default libs
118115
if: matrix.with_pgo

0 commit comments

Comments
 (0)