ci: diagnose windows android emulator boot

Author: DjDeveloperr

.github/workflows/ci.yml

@@ -294,7 +294,7 @@ jobs:
   integration-android:
     name: Android emulator integration (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 50
+    timeout-minutes: 65
     needs:
       - client
       - packages
@@ -349,7 +349,7 @@ jobs:
       - name: Create and boot Android emulator (Windows)
         if: runner.os == 'Windows'
         shell: pwsh
-        timeout-minutes: 30
+        timeout-minutes: 45
         run: |
           $ErrorActionPreference = "Stop"
           $sdk = $env:ANDROID_HOME
@@ -375,6 +375,9 @@ jobs:
           $avdmanager = Join-Path $toolsBin "avdmanager.bat"
           $adb = Join-Path $sdk "platform-tools\adb.exe"
           $emulator = Join-Path $sdk "emulator\emulator.exe"
+          $windowsApi = "30"
+          $windowsPlatform = "platforms;android-$windowsApi"
+          $windowsSystemImage = "system-images;android-$windowsApi;google_apis;x86_64"
 
           $yesFile = Join-Path $env:RUNNER_TEMP "android-sdk-yes.txt"
           1..200 | ForEach-Object { "y" } | Set-Content -Path $yesFile -Encoding ascii
@@ -393,26 +396,67 @@ jobs:
           Write-Host "Accepting Android SDK licenses"
           Invoke-AndroidToolWithInput $sdkmanager "--licenses" $yesFile
           Write-Host "Installing Android SDK emulator packages"
-          Invoke-AndroidToolWithInput $sdkmanager "--install `"platform-tools`" `"emulator`" `"platforms;android-35`" `"system-images;android-35;google_apis;x86_64`"" $yesFile
+          Invoke-AndroidToolWithInput $sdkmanager "--install `"platform-tools`" `"emulator`" `"$windowsPlatform`" `"$windowsSystemImage`"" $yesFile
+          Write-Host "Checking Android emulator acceleration"
+          & $emulator -accel-check
+          if ($LASTEXITCODE -ne 0) {
+            Write-Host "Hosted Windows runner did not report VM acceleration; forcing software acceleration for the CI smoke emulator."
+          }
           Write-Host "Creating Android AVD"
-          Invoke-AndroidToolWithInput $avdmanager "create avd --force --name SimDeck_Pixel_CI --package `"system-images;android-35;google_apis;x86_64`" --device `"pixel_6`"" $noFile
+          Invoke-AndroidToolWithInput $avdmanager "create avd --force --name SimDeck_Pixel_CI --package `"$windowsSystemImage`" --device `"pixel_6`"" $noFile
 
+          $stdout = Join-Path $env:RUNNER_TEMP "simdeck-android-emulator.out.log"
+          $stderr = Join-Path $env:RUNNER_TEMP "simdeck-android-emulator.err.log"
           $args = @(
             "-avd", "SimDeck_Pixel_CI",
             "-no-window",
             "-no-audio",
             "-no-boot-anim",
             "-no-snapshot",
             "-gpu", "swiftshader_indirect",
-            "-grpc", "8554"
+            "-grpc", "8554",
+            "-port", "5554",
+            "-accel", "off",
+            "-no-metrics",
+            "-skip-adb-auth"
           )
+          function Write-EmulatorDiagnostics {
+            Write-Host "adb devices:"
+            & $adb devices -l
+            if (Test-Path $stdout) {
+              Write-Host "emulator stdout tail:"
+              Get-Content $stdout -Tail 80
+            }
+            if (Test-Path $stderr) {
+              Write-Host "emulator stderr tail:"
+              Get-Content $stderr -Tail 120
+            }
+          }
           Write-Host "Starting Android emulator"
-          $process = Start-Process -FilePath $emulator -ArgumentList $args -PassThru
+          $process = Start-Process -FilePath $emulator -ArgumentList $args -PassThru -RedirectStandardOutput $stdout -RedirectStandardError $stderr
           $process.Id | Out-File -FilePath emulator.pid -Encoding ascii
-          & $adb wait-for-device
-          $deadline = (Get-Date).AddMinutes(12)
+          $deviceDeadline = (Get-Date).AddMinutes(8)
+          $deviceSeen = $false
+          do {
+            if ($process.HasExited) {
+              Write-EmulatorDiagnostics
+              throw "Android emulator exited early with code $($process.ExitCode)."
+            }
+            $devices = (& $adb devices)
+            if ($devices -match "emulator-5554\s+(device|offline)") {
+              $deviceSeen = $true
+              break
+            }
+            Start-Sleep -Seconds 5
+          } while ((Get-Date) -lt $deviceDeadline)
+          if (-not $deviceSeen) {
+            Write-EmulatorDiagnostics
+            throw "Android emulator did not appear in adb before the timeout."
+          }
+          $deadline = (Get-Date).AddMinutes(20)
           do {
             if ($process.HasExited) {
+              Write-EmulatorDiagnostics
               throw "Android emulator exited early with code $($process.ExitCode)."
             }
             $booted = (& $adb shell getprop sys.boot_completed).Trim()
@@ -422,7 +466,7 @@ jobs:
             Start-Sleep -Seconds 5
           } while ((Get-Date) -lt $deadline)
           if ($booted -ne "1") {
-            & $adb devices
+            Write-EmulatorDiagnostics
             throw "Android emulator did not boot before the timeout."
           }
           & $adb shell settings put global window_animation_scale 0
@@ -449,8 +493,13 @@ jobs:
             $adb = Join-Path $sdk "platform-tools\adb.exe"
             if (Test-Path $adb) {
               & $adb emu kill
+              if ($LASTEXITCODE -ne 0) {
+                Write-Host "No Android emulator accepted adb emu kill."
+                $global:LASTEXITCODE = 0
+              }
             }
           }
           if (Test-Path emulator.pid) {
             Stop-Process -Id (Get-Content emulator.pid) -Force -ErrorAction SilentlyContinue
           }
+          exit 0

scripts/github-actions.test.mjs

@@ -73,6 +73,23 @@ test("CI runs Android emulator integration on Linux and Windows", () => {
   assert.match(ciWorkflow, /test:integration:android/);
 });
 
+test("Windows Android CI boot path is bounded and diagnostic", () => {
+  const windowsBootStep = stepSlice(
+    ciWorkflow,
+    "Create and boot Android emulator (Windows)",
+    "Android emulator integration tests (Windows)",
+  );
+
+  assert.match(windowsBootStep, /-accel", "off"/);
+  assert.match(windowsBootStep, /-RedirectStandardOutput \$stdout/);
+  assert.match(windowsBootStep, /Write-EmulatorDiagnostics/);
+  assert.match(
+    windowsBootStep,
+    /deviceDeadline = \(Get-Date\)\.AddMinutes\(8\)/,
+  );
+  assert.doesNotMatch(windowsBootStep, /wait-for-device/);
+});
+
 test("Android integration runner resolves Windows executables", () => {
   assert.match(androidIntegration, /simdeck-bin\.exe/);
   assert.match(androidIntegration, /simdeck-bin-win32-x64\.exe/);