Skip to content

Commit

Permalink
8318039: GHA: Bump macOS and Xcode versions
Browse files Browse the repository at this point in the history
Reviewed-by: sgehwolf, andrew
Backport-of: 605c9767291ddf1c409c3e805ffb3182899d06c2
  • Loading branch information
zzambers committed Jul 22, 2024
1 parent f231e27 commit 765bd89
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/submit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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: >
Expand Down Expand Up @@ -1429,7 +1429,7 @@ jobs:
macos_x64_test:
name: macOS x64
runs-on: "macos-11"
runs-on: "macos-13"
needs:
- prerequisites
- macos_x64_build
Expand Down Expand Up @@ -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: >
Expand Down

1 comment on commit 765bd89

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.