Skip to content

Commit 4b1365e

Browse files
committed
8343923: GHA: Switch to Xcode 15 on MacOS AArch64 runners
Backport-of: 4c5bc5f2f091ae861d5329cdae42fe7fa295544b
1 parent 948710f commit 4b1365e

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ jobs:
239239
with:
240240
platform: macos-aarch64
241241
runs-on: 'macos-14'
242-
xcode-toolset-version: '14.3.1'
242+
xcode-toolset-version: '15.4'
243243
configure-arguments: ${{ github.event.inputs.configure-arguments }}
244244
make-arguments: ${{ github.event.inputs.make-arguments }}
245245
if: needs.select.outputs.macos-aarch64 == 'true'
@@ -309,6 +309,7 @@ jobs:
309309
platform: macos-x64
310310
bootjdk-platform: macos-x64
311311
runs-on: macos-13
312+
xcode-toolset-version: '14.3.1'
312313

313314
test-macos-aarch64:
314315
name: macos-aarch64
@@ -319,6 +320,7 @@ jobs:
319320
platform: macos-aarch64
320321
bootjdk-platform: macos-aarch64
321322
runs-on: macos-14
323+
xcode-toolset-version: '15.4'
322324

323325
test-windows-x64:
324326
name: windows-x64

.github/workflows/test.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ on:
3737
runs-on:
3838
required: true
3939
type: string
40+
xcode-toolset-version:
41+
required: false
42+
type: string
4043

4144
env:
4245
# These are needed to make the MSYS2 bash work properly
@@ -147,7 +150,7 @@ jobs:
147150
run: |
148151
# On macOS we need to install some dependencies for testing
149152
brew install make
150-
sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
153+
sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-toolset-version }}.app/Contents/Developer
151154
# This will make GNU make available as 'make' and not only as 'gmake'
152155
echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
153156
if: runner.os == 'macOS'

0 commit comments

Comments
 (0)