chore: Upgrade macos image for CI pipeline (#879)

* update bokken image * fix * fix * workaround
Unity-Technologies · Mar 3, 2023 · 0bfa9ff · 0bfa9ff
1 parent b797474
commit 0bfa9ff
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/.yamato/coverage.yml b/.yamato/coverage.yml
@@ -18,7 +18,7 @@ platforms:
     model: rtx2080
   - name: macos
     type: Unity::metal::macmini
-    image: package-ci/mac:v1.21.1-1092905
+    image: package-ci/macos-12:v4.10.0-1271191
     flavor: m1.mac
 ---
 

diff --git a/.yamato/nativeplugin.yml b/.yamato/nativeplugin.yml
@@ -20,15 +20,15 @@ build_platforms:
   - name: macos
     type: Unity::metal::macmini
     flavor: m1.mac
-    image: package-ci/mac:v1.21.1-1092905
+    image: package-ci/macos-12:v4.10.0-1271191
     build_command: BuildScripts~/build_plugin_mac.sh
     build_testrunner_command: BuildScripts~/build_testrunner_mac.sh
     plugin_path: Runtime/Plugins/macOS/libwebrtc.dylib
     testrunner_path: WebRTCLibTest
   - name: ios
     type: Unity::metal::macmini
     flavor: m1.mac
-    image: package-ci/mac:v1.21.1-1092905
+    image: package-ci/macos-12:v4.10.0-1271191
     build_command: BuildScripts~/build_plugin_ios.sh
     build_testrunner_command: BuildScripts~/build_testrunner_ios.sh
     plugin_path: Runtime/Plugins/iOS/webrtc.framework/**
@@ -60,15 +60,15 @@ test_platforms:
   - name: macos
     type: Unity::metal::macmini
     gpu_type: Unity::metal::macmini
-    image: package-ci/mac:v1.21.1-1092905
-    gpu_image: package-ci/mac:v1.21.1-1092905
+    image: package-ci/macos-12:v4.10.0-1271191
+    gpu_image: package-ci/macos-12:v4.10.0-1271191
     flavor: m1.mac
 # todo(kazuki): Need to support native test on iOS. 
 #  - name: ios
 #    type: Unity::metal::macmini
 #    gpu_type: Unity::metal::macmini
-#    image: package-ci/mac:v1.21.1-1092905
-#    gpu_image: package-ci/mac:v1.21.1-1092905
+#    image: package-ci/macos-12:v4.10.0-1271191
+#    gpu_image: package-ci/macos-12:v4.10.0-1271191
 #    flavor: m1.mac
   - name: android
     type: Unity::mobile::shield

diff --git a/.yamato/upm-ci-libwebrtc.yml b/.yamato/upm-ci-libwebrtc.yml
@@ -8,7 +8,7 @@ platforms:
     build_command: BuildScripts~/build_libwebrtc_win.cmd
   - name: macos
     type: Unity::VM::osx
-    image: package-ci/macos-12:v4.3.0-1248181
+    image: package-ci/macos-12:v4.10.0-1271191
     flavor: m1.mac  
     build_command: BuildScripts~/build_libwebrtc_macos.sh
   - name: linux
@@ -23,7 +23,7 @@ platforms:
     build_command: BuildScripts~/build_libwebrtc_android.sh
   - name: ios
     type: Unity::VM::osx
-    image: package-ci/macos-12:v4.3.0-1248181
+    image: package-ci/macos-12:v4.10.0-1271191
     flavor: m1.mac  
     build_command: BuildScripts~/build_libwebrtc_ios.sh
 projects:

diff --git a/.yamato/upm-ci-webrtc-packages.yml b/.yamato/upm-ci-webrtc-packages.yml
@@ -85,7 +85,7 @@ test_targets:
         platform: standalone
   - name: macos
     type: Unity::metal::macmini
-    image: package-ci/mac:v1.21.1-1092905
+    image: package-ci/macos-12:v4.10.0-1271191
     flavor: m1.mac
     architecture: x64
     gfx_types:
@@ -110,7 +110,7 @@ test_targets:
         platform: standalone
   - name: macos-m1
     type: Unity::metal::devkit
-    image: package-ci/mac:v1.21.1-1092905
+    image: package-ci/macos-12:v4.10.0-1271191
     flavor: m1.mac
     architecture: arm64
     gfx_types:
@@ -216,7 +216,7 @@ build_{{ package.name }}_{{ editor.version }}_ios:
   name : Build {{ package.packagename }} with {{ editor.version }} for ios device
   agent:
     type: Unity::VM::osx
-    image: package-ci/mac:v1.21.1-1092905
+    image: package-ci/macos-12:v4.10.0-1271191
     flavor: b1.large
   commands:
     - |
@@ -241,7 +241,8 @@ test_{{ package.name }}_{{ editor.version }}_ios:
   name: Test {{ package.packagename }} with {{ editor.version }} on ios device
   agent:
     type: Unity::mobile::iPhone
-    image: mobile/ios-macos-11:v0.1.2-1078219
+    image: package-ci/macos-12:v4.10.0-1271191
+    model: SE
     flavor: b1.medium
   skip_checkout: true
   dependencies:
@@ -263,7 +264,7 @@ build_{{ package.name }}_{{ editor.version }}_android_{{ target.name }}:
   name : Build {{ package.packagename }} with {{ editor.version }} for android device {{ target.name }}
   agent:
     type: Unity::VM::osx
-    image: package-ci/mac:v1.21.1-1092905
+    image: package-ci/macos-12:v4.10.0-1271191
     flavor: b1.xlarge
   commands:
     - |
@@ -350,7 +351,7 @@ build_{{ package.name }}_{{ param.platform }}_{{ param.backend }}_{{ target.name
   name : Build {{ package.packagename }} with {{ param.platform }} {{ param.backend }} {{ editor.version }} on {{ target.name }} {{ gfx_type.name }}
   agent:
     type: Unity::VM::osx
-    image: package-ci/mac:v1.21.1-1092905
+    image: package-ci/macos-12:v4.10.0-1271191
     flavor: m1.mac
   commands:
     - |

diff --git a/BuildScripts~/build_testrunner_mac.sh b/BuildScripts~/build_testrunner_mac.sh
@@ -3,6 +3,10 @@
 export LIBWEBRTC_DOWNLOAD_URL=https://github.com/Unity-Technologies/com.unity.webrtc/releases/download/M107/webrtc-mac.zip
 export SOLUTION_DIR=$(pwd)/Plugin~
 
+# Install cmake
+export HOMEBREW_NO_AUTO_UPDATE=1
+brew install cmake
+
 # Download LibWebRTC 
 curl -L $LIBWEBRTC_DOWNLOAD_URL > webrtc.zip
 unzip -d $SOLUTION_DIR/webrtc webrtc.zip

diff --git a/BuildScripts~/template/remote.sh.template b/BuildScripts~/template/remote.sh.template
@@ -41,6 +41,9 @@ then
   suite=editor
 fi
 
+# workaround: upgrade pip
+python3 -m pip install --upgrade pip
+
 # install unity-downloader-cli
 pip3 install unity-downloader-cli                                                     \
   --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple \