pass the unity version to the ios smoke test

getsentry · Jun 24, 2022 · 3b718b9 · 3b718b9
1 parent 4fd1456
commit 3b718b9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,8 +3,8 @@ name: CI
 on:
   push:
     paths-ignore:
-      - '**.md'
-      - '**.txt'
+      - "**.md"
+      - "**.txt"
   workflow_dispatch: # e.g. to manually trigger on foreign PRs
 
 env:
@@ -58,7 +58,7 @@ jobs:
       fail-fast: false
       matrix:
         # 2022.1.0a12 removed until S.T.J issues fixed
-        unity-version: ['2019', '2020', '2021']
+        unity-version: ["2019", "2020", "2021"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2.3.3
@@ -196,11 +196,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ['2019', '2020', '2021']
-        platform: ['Android', 'WebGL', 'Linux', 'iOS']
+        unity-version: ["2019", "2020", "2021"]
+        platform: ["Android", "WebGL", "Linux", "iOS"]
         include:
           - platform: Linux
-            image-suffix: '-il2cpp'
+            image-suffix: "-il2cpp"
     env:
       UNITY_PATH: docker exec unity unity-editor
     steps:
@@ -296,8 +296,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ['2019', '2020', '2021']
-        os: ['windows', 'macos']
+        unity-version: ["2019", "2020", "2021"]
+        os: ["windows", "macos"]
         include:
           - os: windows
             unity-modules: windows-il2cpp
@@ -367,14 +367,14 @@ jobs:
       fail-fast: false
       matrix:
         api-level: [21, 27, 29, 30]
-        unity-version: ['2019', '2020', '2021']
+        unity-version: ["2019", "2020", "2021"]
         exclude:
           # API 21 is no longer supported since Unity 2021.2.10f1
           - api-level: 21
-            unity-version: '2021'
+            unity-version: "2021"
           # Smoke test currently crashes on API 30 with Unity 2021 build on CI, see issue #719
           - api-level: 30
-            unity-version: '2021'
+            unity-version: "2021"
     defaults:
       run:
         shell: pwsh
@@ -392,7 +392,7 @@ jobs:
       - name: Configure Android Settings
         id: droid-settings
         shell: pwsh
-        run : |
+        run: |
           # Setup API Level
           $apiLevel = '${{ matrix.api-level }}'
           if ( $apiLevel -eq 'latest')
@@ -482,7 +482,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ['2019', '2020', '2021']
+        unity-version: ["2019", "2020", "2021"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2.3.3
@@ -495,7 +495,7 @@ jobs:
 
       - name: Build iOS package
         shell: pwsh
-        run: ./Scripts/smoke-test-ios.ps1 Build -IsIntegrationTest
+        run: ./Scripts/smoke-test-ios.ps1 Build -IsIntegrationTest -UnityVersion "${{ matrix.unity-version }}"
 
       - name: Upload iOS test app for smoke test.
         uses: actions/upload-artifact@v2
@@ -514,9 +514,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ['2019', '2020', '2021']
+        unity-version: ["2019", "2020", "2021"]
         # Numbers as string otherwise GH will reformat the runtime numbers removing the fractions.
-        ios-runtime: ['12.0', '12.4', '13.0', '14.1', latest]
+        ios-runtime: ["12.0", "12.4", "13.0", "14.1", latest]
     defaults:
       run:
         shell: pwsh
@@ -562,8 +562,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ['2019', '2020', '2021']
-        platform: ['WebGL', 'Linux']
+        unity-version: ["2019", "2020", "2021"]
+        platform: ["WebGL", "Linux"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2.3.3

diff --git a/scripts/smoke-test-ios.ps1 b/scripts/smoke-test-ios.ps1
@@ -3,6 +3,7 @@ param (
     [string] $SelectedRuntime,
     [Int32] $DevicesToRun = 3,
     [Switch] $IsIntegrationTest
+    [string] $UnityVersion = ""
 )
 Write-Host "Args received Action=$Action, SelectedRuntime=$SelectedRuntime, IsIntegrationTest=$IsIntegrationTest"
 # $Action: 'Build' for build only
@@ -87,7 +88,7 @@ function Build()
     if ($IsIntegrationTest)
     {
         $symbolServerOutput = RunWithSymbolServer -Callback $buildCallback
-        CheckSymbolServerOutput 'IOS' $symbolServerOutput
+        CheckSymbolServerOutput 'IOS' $symbolServerOutput $UnityVersion
     }
     else
     {