From 50c611f9cdb7188afcb4b49df96bc7708e1fe572 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2026 10:21:18 +0000 Subject: [PATCH 1/2] ci(android): Increase API 37 emulator memory Co-Authored-By: Roman Zavarnitsyn --- .github/workflows/integration-tests-ui-critical.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests-ui-critical.yml b/.github/workflows/integration-tests-ui-critical.yml index 1d054079f1..97351821c5 100644 --- a/.github/workflows/integration-tests-ui-critical.yml +++ b/.github/workflows/integration-tests-ui-critical.yml @@ -63,22 +63,27 @@ jobs: target: google_apis channel: canary # Necessary for ATDs arch: x86_64 + memory: 4096 - api-level: 33 # Android 13 target: google_apis channel: canary # Necessary for ATDs arch: x86_64 + memory: 4096 - api-level: 35 # Android 15 target: google_apis channel: canary # Necessary for ATDs arch: x86_64 + memory: 4096 - api-level: 36 # Android 16 target: google_apis channel: canary # Necessary for ATDs arch: x86_64 + memory: 4096 - api-level: "37.0" # Android 17; API 37 ships only as a minor-versioned image target: google_apis_ps16k # API 37 has no plain google_apis image channel: canary # Necessary for ATDs arch: x86_64 + memory: 8192 steps: - name: Checkout code uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -127,7 +132,7 @@ jobs: force-avd-creation: false disable-animations: true disable-spellchecker: true - emulator-options: -memory 4096 -no-window -gpu auto -noaudio -no-boot-anim -camera-back none + emulator-options: -memory ${{ matrix.memory }} -no-window -gpu auto -noaudio -no-boot-anim -camera-back none disk-size: 4096M script: echo "Generated AVD snapshot for caching." @@ -151,7 +156,7 @@ jobs: force-avd-creation: false disable-animations: true disable-spellchecker: true - emulator-options: -memory 4096 -no-window -gpu auto -noaudio -no-boot-anim -camera-back none -no-snapshot-save + emulator-options: -memory ${{ matrix.memory }} -no-window -gpu auto -noaudio -no-boot-anim -camera-back none -no-snapshot-save script: | adb uninstall io.sentry.uitest.android.critical || echo "Already uninstalled (or not found)" adb install -r -d "${{env.APK_NAME}}" From bdd06f6c371cd2b5fcd69095d11e938de3c84581 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2026 10:55:01 +0000 Subject: [PATCH 2/2] ci: Include emulator memory in AVD cache key Co-Authored-By: Roman Zavarnitsyn --- .github/workflows/integration-tests-ui-critical.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration-tests-ui-critical.yml b/.github/workflows/integration-tests-ui-critical.yml index 97351821c5..2ee76141eb 100644 --- a/.github/workflows/integration-tests-ui-critical.yml +++ b/.github/workflows/integration-tests-ui-critical.yml @@ -117,9 +117,9 @@ jobs: path: | ~/.android/avd/* ~/.android/adb* - # Keyed on the cmdline-tools version so AVDs created by the old, broken - # avdmanager are invalidated automatically. - key: avd-api-${{ matrix.api-level }}-${{ matrix.arch }}-${{ matrix.target }}-tools${{ steps.cmdline-tools.outputs.version }} + # Keyed on memory and the cmdline-tools version so incompatible snapshots + # and AVDs created by the old, broken avdmanager are invalidated automatically. + key: avd-api-${{ matrix.api-level }}-${{ matrix.arch }}-${{ matrix.target }}-memory${{ matrix.memory }}-tools${{ steps.cmdline-tools.outputs.version }} - name: Create AVD and generate snapshot for caching if: steps.avd-cache.outputs.cache-hit != 'true'