diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml index b2b020cb..217d8050 100644 --- a/.github/workflows/build_android.yml +++ b/.github/workflows/build_android.yml @@ -40,7 +40,7 @@ permissions: write-all jobs: build_android: name: build-android-unity${{ inputs.unity_version }}-CPP${{ inputs.firebase_cpp_sdk_version }} - runs-on: macos-13 + runs-on: macos-14 strategy: fail-fast: false env: @@ -102,8 +102,13 @@ jobs: brew install swig - name: Force Java 11 + if: runner.os != 'macOS' shell: bash run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV + - name: Force Java 11 (mac) + if: runner.os == 'macOS' + shell: bash + run: echo "JAVA_HOME=${JAVA_HOME_11_arm64}" >> $GITHUB_ENV - name: Install python deps shell: bash diff --git a/.github/workflows/build_ios.yml b/.github/workflows/build_ios.yml index 6bf96fb0..66b237b4 100644 --- a/.github/workflows/build_ios.yml +++ b/.github/workflows/build_ios.yml @@ -40,12 +40,12 @@ permissions: write-all jobs: build_ios: name: build-ios-unity${{ inputs.unity_version }}-CPP${{ inputs.firebase_cpp_sdk_version }} - runs-on: macos-13 + runs-on: macos-14 strategy: fail-fast: false env: - xcodeVersion: "15.1" + xcodeVersion: "16.2" steps: - uses: lukka/get-cmake@latest diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index 61bdfcaa..7512cdb2 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -40,7 +40,7 @@ permissions: write-all jobs: build_desktop: name: build-macOS-unity${{ inputs.unity_version}}-CPP${{ inputs.firebase_cpp_sdk_version }} - runs-on: macos-13 + runs-on: macos-14 strategy: fail-fast: false diff --git a/.github/workflows/build_tvos.yml b/.github/workflows/build_tvos.yml index ad07a924..6eba5e6f 100644 --- a/.github/workflows/build_tvos.yml +++ b/.github/workflows/build_tvos.yml @@ -61,12 +61,12 @@ permissions: write-all jobs: build_tvos: name: build-tvos-unity${{ inputs.unity_version }}-CPP${{ inputs.firebase_cpp_sdk_version }} - runs-on: macos-13 + runs-on: macos-14 strategy: fail-fast: false env: - xcodeVersion: "15.1" + xcodeVersion: "16.2" steps: - uses: lukka/get-cmake@latest diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 46d6dcdf..bc188394 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -176,7 +176,7 @@ jobs: fail-fast: false matrix: ${{ fromJson(needs.check_and_prepare.outputs.build_matrix) }} env: - xcodeVersion: "15.1" + xcodeVersion: "16.2" steps: - uses: lukka/get-cmake@latest with: @@ -484,7 +484,7 @@ jobs: fail-fast: false matrix: ${{ fromJson(needs.check_and_prepare.outputs.test_matrix) }} env: - xcodeVersion: "15.1" + xcodeVersion: "16.2" steps: - id: matrix_info shell: bash diff --git a/gha/unity/unity_installer.py b/gha/unity/unity_installer.py index 806ec9bc..80cf2d69 100644 --- a/gha/unity/unity_installer.py +++ b/gha/unity/unity_installer.py @@ -311,7 +311,10 @@ def download_unity_hub(unity_hub_url, unity_hub_installer, max_attempts=1): def install_unity(unity_full_version, changeset): unity_hub_executable = SETTINGS["unity_hub_executable"][get_os()] - run(f'{unity_hub_executable} install --version {unity_full_version} --changeset {changeset}', max_attempts=MAX_ATTEMPTS) + architecture_flag = '' + if platform.system() == 'Darwin' and 'arm' in platform.machine().lower(): + architecture_flag = '--architecture arm64' + run(f'{unity_hub_executable} install --version {unity_full_version} --changeset {changeset} {architecture_flag}', max_attempts=MAX_ATTEMPTS) run(f'{unity_hub_executable} editors --installed') diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 34b714a4..a561552f 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -56,7 +56,7 @@ # GitHub Runner WINDOWS_RUNNER = "windows-latest" -MACOS_RUNNER = "macos-13" +MACOS_RUNNER = "macos-14" LINUX_RUNNER = "ubuntu-22.04" PARAMETERS = {