feat: Unify main & non-main CI runs

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

@@ -7,19 +7,16 @@ on:
       api-level:
         required: true
         type: string
-      try:
-        required: true
-        type: number
     # Map the workflow outputs to job outputs
     outputs:
-      outcome:
-        description:
-        value: ${{ jobs.run.outputs.outcome }}
+      status:
+        description: "Smoke test status"
+        value: ${{ jobs.run.outputs.status }}
 
 jobs:
   run:
-    name: try-${{ inputs.try }}
-    runs-on: macos-latest
+    name: Android Smoke Test
+    runs-on: ubuntu-latest
     env:
       ARTIFACTS_PATH: samples/IntegrationTest/test-artifacts/
       HOMEBREW_NO_INSTALL_CLEANUP: 1
@@ -28,17 +25,24 @@ jobs:
         shell: pwsh
     # Map the job outputs to step outputs
     outputs:
-      outcome: ${{ steps.smoke-test.outcome }}
+      status: ${{ steps.smoke-test.outputs.status }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-
+        uses: actions/checkout@v4
+      
       - name: Download test app artifact
         uses: actions/download-artifact@v4
         with:
           name: testapp-Android-compiled-${{ inputs.unity-version }}
           path: samples/IntegrationTest/Build
 
+      # See https://github.blog/changelog/2023-02-23-hardware-accelerated-android-virtualization-on-actions-windows-and-linux-larger-hosted-runners/
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       # outputs variables: api-level, label, target
       - name: Configure Android Settings
         id: config
@@ -64,29 +68,28 @@ jobs:
           "target=$target" >> $env:GITHUB_OUTPUT
           "api-level=$apiLevel" >> $env:GITHUB_OUTPUT
           "label=$($label ?? $apiLevel)" >> $env:GITHUB_OUTPUT
-
-      - name: Android API ${{ steps.config.outputs.label }} emulator setup + Smoke test
-        uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b # pin@v2.28.0
+      
+      - name: Run Android Smoke Tests
+        uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b # pin@v233.0
         id: smoke-test
-        timeout-minutes: 40
-        continue-on-error: true
+        timeout-minutes: 30
         with:
           api-level: ${{ steps.config.outputs.api-level }}
           target: ${{ steps.config.outputs.target }}
           force-avd-creation: false
-          ram-size: 2048M
-          arch: x86_64
-          cores: 3
-          emulator-boot-timeout: 1800
-          disk-size: 4096M # Some runs have out of storage error when installing the smoke test.
-          emulator-options: -no-snapshot-save -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -accel on
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          script: pwsh ./scripts/smoke-test-android.ps1 -IsIntegrationTest -WarnIfFlaky
+          arch: x86_64
+          script: |
+            adb wait-for-device
+            adb shell input keyevent 82
+            adb devices -l
+            pwsh ./scripts/smoke-test-android.ps1 -IsIntegrationTest -WarnIfFlaky
 
       - name: Upload artifacts on failure
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4
         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

@@ -247,8 +247,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:
@@ -309,54 +320,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
@@ -463,26 +430,15 @@ jobs:
     if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
     needs: [mobile-smoke-test-compile]
     name: ${{ matrix.unity-version }} Android ${{ matrix.api-level }} Run Smoke Test
-    uses: ./.github/workflows/android-smoke-test-wrapper.yml
+    uses: ./.github/workflows/android-smoke-test.yml
     with:
       unity-version: ${{ matrix.unity-version }}
       api-level: ${{ matrix.api-level }}
     strategy:
       fail-fast: false
       matrix:
-        api-level: [27, 28, 29, 30, 31] # last updated October 2022
+        api-level: [27, 31, 34] # last updated Dezember 2024
         unity-version: ["2019", "2022", "6000"]
-        include:
-          # API 21 is barely used but let's check it as the minimum supported version for now.
-          - api-level: 21
-            unity-version: "2019"
-        exclude:
-          # Seems like there's an error in Unity with Android API 30 - disabling.
-          # https://github.com/getsentry/sentry-unity/issues/719#issuecomment-1129129952
-          - api-level: 30
-            unity-version: "2021"
-          - api-level: 30
-            unity-version: "2022"
 
   mobile-smoke-test-compile:
     if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
@@ -517,11 +473,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 }}
@@ -530,22 +486,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 }}