Skip to content

Commit 7fbd65a

Browse files
Update Mac runners to macos-14 and Xcode to 16.2. (#1257)
* Update Mac runners to macos-14 and Xcode to 16.2. * Handle Unity installing Mac Arm architecture * Use the correct Java 11 on Mac. --------- Co-authored-by: a-maurice <[email protected]>
1 parent 1a8b20f commit 7fbd65a

File tree

7 files changed

+18
-10
lines changed

7 files changed

+18
-10
lines changed

.github/workflows/build_android.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ permissions: write-all
4040
jobs:
4141
build_android:
4242
name: build-android-unity${{ inputs.unity_version }}-CPP${{ inputs.firebase_cpp_sdk_version }}
43-
runs-on: macos-13
43+
runs-on: macos-14
4444
strategy:
4545
fail-fast: false
4646
env:
@@ -102,8 +102,13 @@ jobs:
102102
brew install swig
103103
104104
- name: Force Java 11
105+
if: runner.os != 'macOS'
105106
shell: bash
106107
run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
108+
- name: Force Java 11 (mac)
109+
if: runner.os == 'macOS'
110+
shell: bash
111+
run: echo "JAVA_HOME=${JAVA_HOME_11_arm64}" >> $GITHUB_ENV
107112

108113
- name: Install python deps
109114
shell: bash

.github/workflows/build_ios.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ permissions: write-all
4040
jobs:
4141
build_ios:
4242
name: build-ios-unity${{ inputs.unity_version }}-CPP${{ inputs.firebase_cpp_sdk_version }}
43-
runs-on: macos-13
43+
runs-on: macos-14
4444
strategy:
4545
fail-fast: false
4646

4747
env:
48-
xcodeVersion: "15.1"
48+
xcodeVersion: "16.2"
4949

5050
steps:
5151
- uses: lukka/get-cmake@latest

.github/workflows/build_macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ permissions: write-all
4040
jobs:
4141
build_desktop:
4242
name: build-macOS-unity${{ inputs.unity_version}}-CPP${{ inputs.firebase_cpp_sdk_version }}
43-
runs-on: macos-13
43+
runs-on: macos-14
4444
strategy:
4545
fail-fast: false
4646

.github/workflows/build_tvos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ permissions: write-all
6161
jobs:
6262
build_tvos:
6363
name: build-tvos-unity${{ inputs.unity_version }}-CPP${{ inputs.firebase_cpp_sdk_version }}
64-
runs-on: macos-13
64+
runs-on: macos-14
6565
strategy:
6666
fail-fast: false
6767

6868
env:
69-
xcodeVersion: "15.1"
69+
xcodeVersion: "16.2"
7070

7171
steps:
7272
- uses: lukka/get-cmake@latest

.github/workflows/integration_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
fail-fast: false
177177
matrix: ${{ fromJson(needs.check_and_prepare.outputs.build_matrix) }}
178178
env:
179-
xcodeVersion: "15.1"
179+
xcodeVersion: "16.2"
180180
steps:
181181
- uses: lukka/get-cmake@latest
182182
with:
@@ -484,7 +484,7 @@ jobs:
484484
fail-fast: false
485485
matrix: ${{ fromJson(needs.check_and_prepare.outputs.test_matrix) }}
486486
env:
487-
xcodeVersion: "15.1"
487+
xcodeVersion: "16.2"
488488
steps:
489489
- id: matrix_info
490490
shell: bash

gha/unity/unity_installer.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,10 @@ def download_unity_hub(unity_hub_url, unity_hub_installer, max_attempts=1):
311311

312312
def install_unity(unity_full_version, changeset):
313313
unity_hub_executable = SETTINGS["unity_hub_executable"][get_os()]
314-
run(f'{unity_hub_executable} install --version {unity_full_version} --changeset {changeset}', max_attempts=MAX_ATTEMPTS)
314+
architecture_flag = ''
315+
if platform.system() == 'Darwin' and 'arm' in platform.machine().lower():
316+
architecture_flag = '--architecture arm64'
317+
run(f'{unity_hub_executable} install --version {unity_full_version} --changeset {changeset} {architecture_flag}', max_attempts=MAX_ATTEMPTS)
315318
run(f'{unity_hub_executable} editors --installed')
316319

317320

scripts/gha/print_matrix_configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
# GitHub Runner
5858
WINDOWS_RUNNER = "windows-latest"
59-
MACOS_RUNNER = "macos-13"
59+
MACOS_RUNNER = "macos-14"
6060
LINUX_RUNNER = "ubuntu-22.04"
6161

6262
PARAMETERS = {

0 commit comments

Comments
 (0)