From 765bd89b6c3dd12f9248d8626884103f58cbaa5a Mon Sep 17 00:00:00 2001 From: Zdenek Zambersky Date: Mon, 22 Jul 2024 21:51:08 +0000 Subject: [PATCH] 8318039: GHA: Bump macOS and Xcode versions Reviewed-by: sgehwolf, andrew Backport-of: 605c9767291ddf1c409c3e805ffb3182899d06c2 --- .github/workflows/submit.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index 4d2c1d1f15..71cbd228ad 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -1331,7 +1331,7 @@ jobs: macos_x64_build: name: macOS x64 - runs-on: "macos-11" + runs-on: "macos-13" needs: prerequisites if: needs.prerequisites.outputs.should_run != 'false' && needs.prerequisites.outputs.platform_macos_x64 != 'false' @@ -1395,10 +1395,10 @@ jobs: run: chmod -R a+rx ${HOME}/jtreg/ - name: Install dependencies - run: brew install make + run: brew install make gawk - name: Select Xcode version - run: sudo xcode-select --switch /Applications/Xcode_11.7.app/Contents/Developer + run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer - name: Configure run: > @@ -1429,7 +1429,7 @@ jobs: macos_x64_test: name: macOS x64 - runs-on: "macos-11" + runs-on: "macos-13" needs: - prerequisites - macos_x64_build @@ -1512,10 +1512,10 @@ jobs: tar -xzf "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_osx-x64_bin${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_osx-x64_bin${{ matrix.artifact }}" - name: Install dependencies - run: brew install make + run: brew install make gawk - name: Select Xcode version - run: sudo xcode-select --switch /Applications/Xcode_11.7.app/Contents/Developer + run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer - name: Run tests run: >