Skip to content

Commit 686f120

Browse files
committed
Update Java version.
1 parent 1212a55 commit 686f120

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

.github/workflows/android.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,13 @@ jobs:
5858
if: runner.os == 'macOS'
5959
run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
6060
- name: Force Java 11
61+
if: !startsWith(matrix.os, 'macos')
6162
shell: bash
6263
run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
64+
- name: Force Java 11 (mac)
65+
if: startsWith(matrix.os, 'macos')
66+
shell: bash
67+
run: echo "JAVA_HOME=${JAVA_HOME_11_arm64}" >> $GITHUB_ENV
6368
- name: Store git credentials for all git commands
6469
# Forces all git commands to use authenticated https, to prevent throttling.
6570
shell: bash

.github/workflows/integration_tests.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,13 @@ jobs:
435435
ref: ${{needs.check_and_prepare.outputs.github_ref}}
436436
submodules: true
437437
- name: Force Java 11
438+
if: !startsWith(matrix.os, 'macos')
438439
shell: bash
439440
run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
441+
- name: Force Java 11 (mac)
442+
if: startsWith(matrix.os, 'macos')
443+
shell: bash
444+
run: echo "JAVA_HOME=${JAVA_HOME_11_arm64}" >> $GITHUB_ENV
440445
- name: Add msbuild to PATH (Windows)
441446
if: startsWith(matrix.os, 'windows')
442447
uses: microsoft/[email protected]

0 commit comments

Comments
 (0)