feat: Unify main & non-main CI runs

.github/workflows/android-smoke-test.yml

@@ -92,4 +92,4 @@ jobs:
         with:
           name: testapp-android-logs-${{ inputs.api-level }}-${{ inputs.unity-version }}-${{ inputs.try }}
           path: ${{ env.ARTIFACTS_PATH }}
-          retention-days: 14
+          retention-days: 14

.github/workflows/ci.yml

@@ -254,8 +254,19 @@ jobs:
         unity-version: ["2019", "2022", "6000"]
         platform: ["Android", "WebGL", "Linux", "iOS"]
         include:
+          - platform: iOS
+            check_symbols: false
+            build_platform: iOS
+          - platform: Android
+            check_symbols: false
+            build_platform: Android-Export
+          - platform: WebGL
+            check_symbols: true
+            build_platform: WebGL
           - platform: Linux
             image-suffix: "-il2cpp"
+            check_symbols: true
+            build_platform: Linux            
     env:
       UNITY_PATH: docker exec unity unity-editor
     steps:
@@ -316,54 +327,10 @@ jobs:
         run: ./test/Scripts.Integration.Test/add-sentry.ps1 -UnityPath "${{ env.UNITY_PATH }}"
 
       - name: Configure Sentry
-        run: |
-          $isAndroid = ('${{ matrix.platform }}' -eq 'Android')
-          $isNotMainBranch = ('${{ github.ref_name }}' -ne 'main')
-          $platform = if ($isAndroid -and $isNotMainBranch) { 'Android-Export' } else { '${{ matrix.platform }}' }
-
-          ./test/Scripts.Integration.Test/configure-sentry.ps1 -UnityPath "${{ env.UNITY_PATH }}" -Platform $platform -CheckSymbols
-
-      # Dear lord, I don't know why we have to do this: If we do not "pre-build" the project then `exportAsGoogleAndroidProject` will stay `false` in `IPostGenerateGradleAndroidProject`
-      # and breaking all further steps in CI 
-      # Things I tried:
-        # 1. Setting the flag and restarting the editor prior to build
-        # 2. Setting the flag and reloading the domain in a step prior to building
-        # 3. Reloading the domain prior to building (does not work - build fails with a domain reload pending)
-      - name: Pre-Build Project for Unity 6 and Android
-        continue-on-error: true
-        if: ${{ matrix.unity-version == '6000' && matrix.platform == 'Android' }}
-        run: |
-          $platform = '${{ matrix.platform }}'
-          if ('${{ github.ref_name }}' -ne 'main')
-          {
-            $checkSymbols = $false
-            $platform = 'Android-Export'
-          }
-          else
-          {
-            $checkSymbols = $false
-          }
-
-          ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "${{ env.UNITY_PATH }}" -Platform $platform -CheckSymbols:$checkSymbols -UnityVersion "${{ matrix.unity-version }}"
-          Remove-Item -Path samples/IntegrationTest/Build -Recurse -Force -Confirm:$false
-
+        run: ./test/Scripts.Integration.Test/configure-sentry.ps1 -UnityPath "${{ env.UNITY_PATH }}" -Platform ${{ matrix.build_platform }} -CheckSymbols
+
       - name: Build Project
-        run: |
-          $platform = '${{ matrix.platform }}'
-          if ($platform -eq 'iOS')
-          {
-            $checkSymbols = $false
-          }
-          elseif (($platform -eq 'Android') -and ('${{ github.ref_name }}' -ne 'main'))
-          {
-            $checkSymbols = $false
-            $platform = 'Android-Export'
-          }
-          else
-          {
-            $checkSymbols = $true
-          }
-          ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "${{ env.UNITY_PATH }}" -Platform $platform -CheckSymbols:$checkSymbols -UnityVersion "${{ matrix.unity-version }}"
+        run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "${{ env.UNITY_PATH }}" -Platform ${{ matrix.build_platform }} -CheckSymbols:$${{ matrix.check_symbols }} -UnityVersion "${{ matrix.unity-version }}"
 
       # We create tar explicitly because upload-artifact is slow for many files.
       - name: Create archive
@@ -513,11 +480,11 @@ jobs:
 
       - name: Setup Android
         uses: android-actions/setup-android@7c5672355aaa8fde5f97a91aa9a99616d1ace6bc # pin@v2
-        if: ${{ matrix.platform == 'Android' && github.ref_name != 'main' }}
+        if: ${{ matrix.platform == 'Android' }}
 
       - name: Setup NDK
         uses: nttld/setup-ndk@8c3b609ff4d54576ea420551943fd34b4d03b0dc # pin@v1
-        if: ${{ matrix.platform == 'Android' && github.ref_name != 'main' }}
+        if: ${{ matrix.platform == 'Android' }}
         id: setup-ndk
         with:
           ndk-version: ${{ matrix.ndk }}
@@ -526,22 +493,22 @@ jobs:
       # We modify the exported gradle project to deal with the different build-environment
       # I.e. we're fixing the paths for SDK & NDK that have been hardcoded to point at the Unity installation 
       - name: Modify gradle project
-        if: ${{ matrix.platform == 'Android' && github.ref_name != 'main' }}
+        if: ${{ matrix.platform == 'Android' }}
         run: |
           ./test/Scripts.Integration.Test/modify-gradle-project.ps1 `
             -AndroidSdkRoot $env:ANDROID_SDK_ROOT `
             -NdkPath ${{ steps.setup-ndk.outputs.ndk-path }} `
             -UnityVersion ${{ matrix.unity-version }}
 
       - name: Setup JDK 17 for Unity 6
-        if: ${{ matrix.platform == 'Android' && github.ref_name != 'main' && matrix.unity-version == '6000' }}
+        if: ${{ matrix.platform == 'Android' && matrix.unity-version == '6000' }}
         uses: actions/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'
 
       - name: Android smoke test
-        if: ${{ matrix.platform == 'Android' && github.ref_name != 'main' }}
+        if: ${{ matrix.platform == 'Android' }}
         run: ./scripts/smoke-test-android.ps1 Build -IsIntegrationTest -UnityVersion "${{ matrix.unity-version }}"
         env:
           JAVA_HOME: ${{ env.JAVA_HOME }}