From 82a609dd7841eab66866e785ddd035b55d441970 Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Mon, 18 Nov 2024 16:25:53 +0000
Subject: [PATCH] 8343923: GHA: Switch to Xcode 15 on MacOS AArch64 runners
Backport-of: 4c5bc5f2f091ae861d5329cdae42fe7fa295544b
---
.github/workflows/main.yml | 4 +++-
.github/workflows/test.yml | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e89dcb81809..6db382ea324 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -237,7 +237,7 @@ jobs:
with:
platform: macos-aarch64
runs-on: 'macos-14'
- xcode-toolset-version: '14.3.1'
+ xcode-toolset-version: '15.4'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.macos-aarch64 == 'true'
@@ -291,6 +291,7 @@ jobs:
platform: macos-x64
bootjdk-platform: macos-x64
runs-on: macos-13
+ xcode-toolset-version: '14.3.1'
test-macos-aarch64:
name: macos-aarch64
@@ -301,6 +302,7 @@ jobs:
platform: macos-aarch64
bootjdk-platform: macos-aarch64
runs-on: macos-14
+ xcode-toolset-version: '15.4'
test-windows-x64:
name: windows-x64
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a8885866c12..3517fa53941 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,6 +37,9 @@ on:
runs-on:
required: true
type: string
+ xcode-toolset-version:
+ required: false
+ type: string
env:
# These are needed to make the MSYS2 bash work properly
@@ -147,7 +150,7 @@ jobs:
run: |
# On macOS we need to install some dependencies for testing
brew install make
- sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
+ sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-toolset-version }}.app/Contents/Developer
# This will make GNU make available as 'make' and not only as 'gmake'
echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
if: runner.os == 'macOS'
--
GitLab