Skip to content

Commit 6a9eb07

Browse files
vieirojerboaa
authored andcommitted
8343786: [11u] GHA: Bump macOS and Xcode versions to macos-13 and XCode 14.3.1
Reviewed-by: andrew
1 parent 46ef0f6 commit 6a9eb07

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/build-macos.yml

Lines changed: 2 additions & 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-12
58+
runs-on: macos-13
5959

6060
strategy:
6161
fail-fast: false
@@ -98,6 +98,7 @@ jobs:
9898
--with-jtreg=${{ steps.jtreg.outputs.path }}
9999
--enable-jtreg-failure-handler
100100
--with-zlib=system
101+
--disable-warnings-as-errors
101102
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
102103
echo "Dumping config.log:" &&
103104
cat config.log &&

.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: '13.4.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: '13.4.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-12
301+
runs-on: macos-13
302302

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

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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_13.4.1.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'

0 commit comments

Comments
 (0)