Skip to content

Commit 82e2866

Browse files
vieirogdams
authored andcommittedJul 9, 2024
8318039: GHA: Bump macOS and Xcode versions
Reviewed-by: andrew Backport-of: 605c9767291ddf1c409c3e805ffb3182899d06c2
1 parent b005573 commit 82e2866

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed
 

‎.github/workflows/build-macos.yml

+1-1
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

+3-3
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: '11.7'
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.4'
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

+2-2
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
@@ -127,7 +127,7 @@ jobs:
127127
run: |
128128
# On macOS we need to install some dependencies for testing
129129
brew install make
130-
sudo xcode-select --switch /Applications/Xcode_11.7.app/Contents/Developer
130+
sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
131131
# This will make GNU make available as 'make' and not only as 'gmake'
132132
echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
133133
if: runner.os == 'macOS'

1 commit comments

Comments
 (1)

openjdk-notifier[bot] commented on Jul 9, 2024

@openjdk-notifier[bot]
Please sign in to comment.