stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8343923: GHA: Switch to Xcode 15 on MacOS AArch64 runners

Browse Source 
Reviewed-by: ihse
This commit is contained in:
Aleksey Shipilev 2024-11-13 14:17:38 +00:00
parent 8af304c60f
commit 4c5bc5f2f0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View File

@ -284,7 +284,7 @@ jobs:
with: with:
platform: macos-aarch64 platform: macos-aarch64
runs-on: 'macos-14' runs-on: 'macos-14'
xcode-toolset-version: '14.3.1' xcode-toolset-version: '15.4'
configure-arguments: ${{ github.event.inputs.configure-arguments }} configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }} make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.prepare.outputs.macos-aarch64 == 'true' if: needs.prepare.outputs.macos-aarch64 == 'true'
@ -354,6 +354,7 @@ jobs:
platform: macos-x64 platform: macos-x64
bootjdk-platform: macos-x64 bootjdk-platform: macos-x64
runs-on: macos-13 runs-on: macos-13
xcode-toolset-version: '14.3.1'
test-macos-aarch64: test-macos-aarch64:
name: macos-aarch64 name: macos-aarch64
@ -364,6 +365,7 @@ jobs:
platform: macos-aarch64 platform: macos-aarch64
bootjdk-platform: macos-aarch64 bootjdk-platform: macos-aarch64
runs-on: macos-14 runs-on: macos-14
xcode-toolset-version: '15.4'
test-windows-x64: test-windows-x64:
name: windows-x64 name: windows-x64

5
.github/workflows/test.yml vendored
View File

@ -37,6 +37,9 @@ on:
runs-on: runs-on:
required: true required: true
type: string type: string
xcode-toolset-version:
required: false
type: string
env: env:
# These are needed to make the MSYS2 bash work properly # These are needed to make the MSYS2 bash work properly
@ -147,7 +150,7 @@ jobs:
run: | run: |
# On macOS we need to install some dependencies for testing # On macOS we need to install some dependencies for testing
brew install make 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' # This will make GNU make available as 'make' and not only as 'gmake'
echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
if: runner.os == 'macOS' if: runner.os == 'macOS'