Skip to content

Commit 7144027

Browse files
committed
8318039: GHA: Bump macOS and Xcode versions
Reviewed-by: andrew Backport-of: 79bd47a78c0cc34bf3ff068038ef5cc1d56b762a
1 parent 8d974ea commit 7144027

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/build-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ on:
5555
jobs:
5656
build-macos:
5757
name: build
58-
runs-on: macos-11
58+
runs-on: macos-13
5959

6060
strategy:
6161
fail-fast: false

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ jobs:
223223
uses: ./.github/workflows/build-macos.yml
224224
with:
225225
platform: macos-x64
226-
xcode-toolset-version: '12.5.1'
226+
xcode-toolset-version: '14.3.1'
227227
configure-arguments: ${{ github.event.inputs.configure-arguments }}
228228
make-arguments: ${{ github.event.inputs.make-arguments }}
229229
if: needs.select.outputs.macos-x64 == 'true'
@@ -234,7 +234,7 @@ jobs:
234234
uses: ./.github/workflows/build-macos.yml
235235
with:
236236
platform: macos-aarch64
237-
xcode-toolset-version: '12.5.1'
237+
xcode-toolset-version: '14.3.1'
238238
extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
239239
configure-arguments: ${{ github.event.inputs.configure-arguments }}
240240
make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -298,7 +298,7 @@ jobs:
298298
with:
299299
platform: macos-x64
300300
bootjdk-platform: macos-x64
301-
runs-on: macos-11
301+
runs-on: macos-13
302302

303303
test-windows-x64:
304304
name: windows-x64

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -147,7 +147,7 @@ jobs:
147147
run: |
148148
# On macOS we need to install some dependencies for testing
149149
brew install make
150-
sudo xcode-select --switch /Applications/Xcode_11.7.app/Contents/Developer
150+
sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
151151
# This will make GNU make available as 'make' and not only as 'gmake'
152152
echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
153153
if: runner.os == 'macOS'

0 commit comments

Comments
 (0)