Merge pull request #343 from immutable/test/ios-builder-host

[DX-3432] test: ability to specify host for mobile builder
immutable · Nov 5, 2024 · c2a7363 · c2a7363
2 parents e5ec4ad + a9e1371
commit c2a7363
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/sample/Assets/Editor/MobileBuilder.cs b/sample/Assets/Editor/MobileBuilder.cs
@@ -79,6 +79,19 @@ private static BuildTarget GetPlatformFromArgs()
         return BuildTarget.Android; // Default to Android if no platform is specified
     }
 
+    private static string GetAltTesterHostFromArgs()
+    {
+        string[] args = Environment.GetCommandLineArgs();
+        for (int i = 0; i < args.Length; i++)
+        {
+            if (args[i] == "--host" && i + 1 < args.Length)
+            {
+                return args[i + 1];
+            }
+        }
+        return null;
+    }
+
     private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, BuildOptions buildOptions, BuildTarget platform)
     {
         return new BuildPlayerOptions
@@ -106,7 +119,7 @@ private static void SetupAltTester(BuildPlayerOptions buildPlayerOptions, BuildT
         AltBuilder.CreateJsonFileForInputMappingOfAxis();
 
         var instrumentationSettings = new AltInstrumentationSettings();
-        var host = System.Environment.GetEnvironmentVariable("ALTSERVER_HOST");
+        var host = System.Environment.GetEnvironmentVariable("ALTSERVER_HOST") ?? GetAltTesterHostFromArgs();
         if (!string.IsNullOrEmpty(host))
         {
             instrumentationSettings.AltServerHost = host;

diff --git a/sample/Assets/Scenes/SelectAuthMethod.unity b/sample/Assets/Scenes/SelectAuthMethod.unity
@@ -206,7 +206,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 416242725}
   m_HandleRect: {fileID: 416242724}
   m_Direction: 0
-  m_Value: 0
+  m_Value: 1
   m_Size: 0.9999999
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -1323,7 +1323,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 167431872}
   m_HandleRect: {fileID: 167431871}
   m_Direction: 2
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -1673,8 +1673,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 1259.3727, y: 0}
-  m_SizeDelta: {x: 2478.7454, y: 0}
+  m_AnchoredPosition: {x: 1161.847, y: 0}
+  m_SizeDelta: {x: 2283.694, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1661390145
 MonoBehaviour:
@@ -1768,8 +1768,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 1259.3727, y: 0}
-  m_SizeDelta: {x: 2478.7454, y: 0}
+  m_AnchoredPosition: {x: 1161.847, y: 0}
+  m_SizeDelta: {x: 2283.694, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1688502349
 MonoBehaviour:

diff --git a/sample/ProjectSettings/ProjectSettings.asset b/sample/ProjectSettings/ProjectSettings.asset
@@ -797,7 +797,7 @@ PlayerSettings:
     WebGL: 1
     Windows Store Apps: 1
     XboxOne: 1
-    iPhone: 3
+    iPhone: 4
     tvOS: 1
   incrementalIl2cppBuild: {}
   suppressCommonWarnings: 1