diff --git a/.github/workflows/sdk-release.yml b/.github/workflows/sdk-release.yml index c75e8ddf..4f1ee668 100644 --- a/.github/workflows/sdk-release.yml +++ b/.github/workflows/sdk-release.yml @@ -874,8 +874,11 @@ jobs: runs-on: macos-14 # GitHub's hosted Apple Silicon runner does not expose Hypervisor.Framework # to the nested Android VM (HV_UNSUPPORTED). Keep the real arm64 image and - # use software CPU emulation rather than weakening this to an x86 smoke. - timeout-minutes: 90 + # explicitly opt into unsupported, slow TCG software CPU emulation rather + # than weakening this to an x86 smoke. + timeout-minutes: 120 + env: + ANDROID_I_WANT_MY_TCG: "yes" steps: - name: Download all consumer Android APKs uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 @@ -885,16 +888,16 @@ jobs: merge-multiple: true - name: Boot arm64 emulator, install and launch the game - timeout-minutes: 85 + timeout-minutes: 115 uses: reactivecircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d # v2.38.0 with: api-level: 30 arch: arm64-v8a target: google_apis - emulator-boot-timeout: 1200 + emulator-boot-timeout: 1800 emulator-options: >- -no-window - -gpu swiftshader_indirect + -gpu swiftshader -no-snapshot -noaudio -no-boot-anim diff --git a/scripts/tests/test_mobile_sdk_release_gates.py b/scripts/tests/test_mobile_sdk_release_gates.py index 85702c94..6e6c4e64 100644 --- a/scripts/tests/test_mobile_sdk_release_gates.py +++ b/scripts/tests/test_mobile_sdk_release_gates.py @@ -30,7 +30,9 @@ class MobileSdkReleaseGateTests(unittest.TestCase): self.assertIn("pattern: android-apk-*", block) self.assertIn("merge-multiple: true", block) self.assertIn("arch: arm64-v8a", block) - self.assertIn("emulator-boot-timeout: 1200", block) + self.assertIn('ANDROID_I_WANT_MY_TCG: "yes"', block) + self.assertIn("emulator-boot-timeout: 1800", block) + self.assertIn("-gpu swiftshader", block) self.assertIn("-accel off", block) self.assertIn("for apk_file in apk/*.apk", block) self.assertIn("EVE_CI_GAME_OK", block)