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

8318039: GHA: Bump macOS and Xcode versions

Browse Source 
Reviewed-by: erikj, prr, ihse, clanger
This commit is contained in:
Mikael Vidstedt 2023-10-13 17:25:00 +00:00
parent 6273ab97dc
commit 605c976729
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-macos.yml vendored
View File

@ -55,7 +55,7 @@ on:
jobs: jobs:
build-macos: build-macos:
name: build name: build
runs-on: macos-11 runs-on: macos-13
strategy: strategy:
fail-fast: false fail-fast: false

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

@ -227,7 +227,7 @@ jobs:
uses: ./.github/workflows/build-macos.yml uses: ./.github/workflows/build-macos.yml
with: with:
platform: macos-x64 platform: macos-x64
xcode-toolset-version: '12.5.1' xcode-toolset-version: '14.3.1'
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.select.outputs.macos-x64 == 'true' if: needs.select.outputs.macos-x64 == 'true'
@ -238,7 +238,7 @@ jobs:
uses: ./.github/workflows/build-macos.yml uses: ./.github/workflows/build-macos.yml
with: with:
platform: macos-aarch64 platform: macos-aarch64
xcode-toolset-version: '12.5.1' xcode-toolset-version: '14.3.1'
extra-conf-options: '--openjdk-target=aarch64-apple-darwin' extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
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 }}
@ -318,7 +318,7 @@ jobs:
with: with:
platform: macos-x64 platform: macos-x64
bootjdk-platform: macos-x64 bootjdk-platform: macos-x64
runs-on: macos-11 runs-on: macos-13
test-windows-x64: test-windows-x64:
name: windows-x64 name: windows-x64

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

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -132,7 +132,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_11.7.app/Contents/Developer sudo xcode-select --switch /Applications/Xcode_14.3.1.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'