From 2217fe68f3edeba58a8ce88e053e246ae519d06e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Chrobot?= <michal.chrobot@unity3d.com>
Date: Wed, 14 Oct 2026 11:08:43 +0200
Subject: [PATCH 1/2] small adjustments

---
 .yamato/project.metafile           | 5 +++--
 testproject/Packages/manifest.json | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.yamato/project.metafile b/.yamato/project.metafile
index 52e4d295ab..b8afb38134 100644
--- a/.yamato/project.metafile
+++ b/.yamato/project.metafile
@@ -90,12 +90,13 @@ test_platforms:
         # iOS modern builds are ARM64-only, thus no testing with armv7
         - name: ios-arm64
           type: Unity::VM::osx
-          image: package-ci/macos-13:v4
+          image: package-ci/macos-13-arm64:v4
           flavor: m1.mac
           larger_flavor: m1.mac
+          model: M1
           standalone: IOS
           base: mac
-          architecture: x64 # package-ci/macos-13:v4 without a model is an Intel VM
+          architecture: arm64 # trunk no longer ships macOS x64 editors
           target_architecture: arm64
     mobile_test:
         - name: android
diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json
index 48f23b48d5..c2ade0b476 100644
--- a/testproject/Packages/manifest.json
+++ b/testproject/Packages/manifest.json
@@ -1,7 +1,6 @@
 {
   "disableProjectUpdate": false,
   "dependencies": {
-    "com.unity.addressables": "4.0.1",
     "com.unity.ai.navigation": "2.0.14",
     "com.unity.collab-proxy": "2.13.6",
     "com.unity.ide.rider": "3.0.40",

From 0d995bb6fb1e9568ef095613750f76d2d7d45dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Chrobot?= <michal.chrobot@unity3d.com>
Date: Wed, 14 Oct 2026 14:36:51 +0200
Subject: [PATCH 2/2] fixes to mobile failures

---
 .yamato/mobile-standalone-test.yml               |  7 +++----
 testproject/Assets/Editor.meta                   |  8 ++++++++
 .../Assets/Editor/IOSBuildPreprocessor.cs        | 16 ++++++++++++++++
 .../Assets/Editor/IOSBuildPreprocessor.cs.meta   | 11 +++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 testproject/Assets/Editor.meta
 create mode 100644 testproject/Assets/Editor/IOSBuildPreprocessor.cs
 create mode 100644 testproject/Assets/Editor/IOSBuildPreprocessor.cs.meta

diff --git a/.yamato/mobile-standalone-test.yml b/.yamato/mobile-standalone-test.yml
index 1c61148c8c..8fb380723a 100644
--- a/.yamato/mobile-standalone-test.yml
+++ b/.yamato/mobile-standalone-test.yml
@@ -91,11 +91,10 @@ mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
     - command: wget http://artifactory-slo.bf.unity3d.com/artifactory/mobile-generic/android/ADBKeys.zip!/adbkey -O %USERPROFILE%/.android/adbkey
     - command: gsudo NetSh Advfirewall set allprofiles state off
 
-    # Connect to Android device
-    - command: '"%ANDROID_SDK_ROOT%\platform-tools\adb.exe" connect %BOKKEN_DEVICE_IP%'
-
-    # Run tests for Android devices
+    # Connect to Android device and run tests
     - |
+      set ANDROID_SDK_ROOT=%CD%\.Editor\Data\PlaybackEngines\AndroidPlayer\SDK
+      "%ANDROID_SDK_ROOT%\platform-tools\adb.exe" connect %BOKKEN_DEVICE_IP% || exit /b 1
       set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
       UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --artifacts-path=test-results --player-load-path=build/players --testproject={{ project.path }} --editor-location=.Editor --player-connection-ip=%BOKKEN_HOST_IP% --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }}
 {% else %}
diff --git a/testproject/Assets/Editor.meta b/testproject/Assets/Editor.meta
new file mode 100644
index 0000000000..a5fa4dc9b3
--- /dev/null
+++ b/testproject/Assets/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3182a83f25034f9bb5f1959333b23be5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/testproject/Assets/Editor/IOSBuildPreprocessor.cs b/testproject/Assets/Editor/IOSBuildPreprocessor.cs
new file mode 100644
index 0000000000..6e93e6353a
--- /dev/null
+++ b/testproject/Assets/Editor/IOSBuildPreprocessor.cs
@@ -0,0 +1,16 @@
+#if UNITY_IOS
+using UnityEditor;
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+
+// Keeps the Debug IL2CPP GameAssembly within the arm64 linker's +/-128MB branch range.
+public class IOSBuildPreprocessor : IPreprocessBuildWithReport
+{
+    public int callbackOrder => 0;
+
+    public void OnPreprocessBuild(BuildReport report)
+    {
+        PlayerSettings.SetIl2CppCodeGeneration(NamedBuildTarget.iOS, Il2CppCodeGeneration.OptimizeSize);
+    }
+}
+#endif
diff --git a/testproject/Assets/Editor/IOSBuildPreprocessor.cs.meta b/testproject/Assets/Editor/IOSBuildPreprocessor.cs.meta
new file mode 100644
index 0000000000..c1e8b4935a
--- /dev/null
+++ b/testproject/Assets/Editor/IOSBuildPreprocessor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2478155c438c47dd8ecf003d4f141994
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: