From d31ccf23412cda3216a296a5d651c3c2717128bf Mon Sep 17 00:00:00 2001 From: a-maurice Date: Thu, 30 May 2024 13:37:05 -0700 Subject: [PATCH 1/2] Pin GHA workflows to macos-13 --- .github/workflows/build_macos.yaml | 2 +- .github/workflows/test.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_macos.yaml b/.github/workflows/build_macos.yaml index 637153cb..60c165bf 100644 --- a/.github/workflows/build_macos.yaml +++ b/.github/workflows/build_macos.yaml @@ -33,7 +33,7 @@ env: jobs: build_desktop: name: build-macOS-unity${{ inputs.unity_version}} - runs-on: macos-latest + runs-on: macos-13 strategy: fail-fast: false diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e6088361..8508ae07 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -107,7 +107,7 @@ jobs: test_on_macos: name: test-macOS-unity${{ needs.check_and_prepare.outputs.unity_version }} - runs-on: macos-latest + runs-on: macos-13 needs: [check_and_prepare] strategy: fail-fast: false From be35d692ee0bce6592806d885693ac82c68d15ea Mon Sep 17 00:00:00 2001 From: a-maurice Date: Thu, 30 May 2024 14:28:30 -0700 Subject: [PATCH 2/2] Force the GHA runners to use Java 8 --- .github/workflows/build_macos.yaml | 4 ++++ .github/workflows/test.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/build_macos.yaml b/.github/workflows/build_macos.yaml index 60c165bf..48a8b97f 100644 --- a/.github/workflows/build_macos.yaml +++ b/.github/workflows/build_macos.yaml @@ -55,6 +55,10 @@ jobs: shell: bash run: echo "UNITY_EXE=${{ env.UNITY_ROOT_DIR }}/Unity.app/Contents/MacOS/Unity" >> $GITHUB_ENV + - name: Force Java 8 + shell: bash + run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + # Build .unitypackage - run: ./gradlew buildPlugin --info diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8508ae07..a2bff30f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -128,6 +128,10 @@ jobs: shell: bash run: echo "UNITY_EXE=${{ env.UNITY_ROOT_DIR }}/Unity.app/Contents/MacOS/Unity" >> $GITHUB_ENV + - name: Force Java 8 + shell: bash + run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + - name: Run tests shell: bash timeout-minutes: 60