From d034e7848a3c89af60a0fbef74c6c4b8674636ba Mon Sep 17 00:00:00 2001 From: finalerock44 <77282157+finalerock44@users.noreply.github.com> Date: Thu, 10 Sep 2026 03:01:24 +0100 Subject: [PATCH 1/2] ci: cover Android API 37, generic-tablet API 36 and the full m1 AVD matrix --- .../android-devices-matrix-chrome-cpu1.yml | 16 +++++-- .../workflows/android-devices-matrix-cpu1.yml | 16 +++++-- .../workflows/android-devices-matrix-gpu1.yml | 12 ++++-- .../workflows/android-devices-matrix-m1.yml | 42 +++++++++++++++++-- 4 files changed, 71 insertions(+), 15 deletions(-) diff --git a/.github/workflows/android-devices-matrix-chrome-cpu1.yml b/.github/workflows/android-devices-matrix-chrome-cpu1.yml index d3d663c..9da6fd5 100644 --- a/.github/workflows/android-devices-matrix-chrome-cpu1.yml +++ b/.github/workflows/android-devices-matrix-chrome-cpu1.yml @@ -31,7 +31,7 @@ jobs: fail-fast: false matrix: include: - # Pixel 6 supports API 29-36 + # Pixel 6 supports API 29-37 - device: pixel-6 api-level: "29" - device: pixel-6 @@ -48,6 +48,8 @@ jobs: api-level: "35" - device: pixel-6 api-level: "36" + - device: pixel-6 + api-level: "37" # Pixel 6 Pro supports API 33, 35 - device: pixel-6-pro @@ -55,7 +57,7 @@ jobs: - device: pixel-6-pro api-level: "35" - # Pixel 7 supports API 33-36 + # Pixel 7 supports API 33-37 - device: pixel-7 api-level: "33" - device: pixel-7 @@ -64,13 +66,15 @@ jobs: api-level: "35" - device: pixel-7 api-level: "36" + - device: pixel-7 + api-level: "37" # Google Play: only pixel-7 / API 34 is supported - device: pixel-7 api-level: "34" google-play: true - # Pixel 7 Pro supports API 33-36 + # Pixel 7 Pro supports API 33-37 - device: pixel-7-pro api-level: "33" - device: pixel-7-pro @@ -79,10 +83,14 @@ jobs: api-level: "35" - device: pixel-7-pro api-level: "36" + - device: pixel-7-pro + api-level: "37" - # Generic Tablet supports API 33 only + # Generic Tablet supports API 33 and 36 - device: generic-tablet api-level: "33" + - device: generic-tablet + api-level: "36" steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/android-devices-matrix-cpu1.yml b/.github/workflows/android-devices-matrix-cpu1.yml index 11c15b8..18e7667 100644 --- a/.github/workflows/android-devices-matrix-cpu1.yml +++ b/.github/workflows/android-devices-matrix-cpu1.yml @@ -31,7 +31,7 @@ jobs: fail-fast: false matrix: include: - # Pixel 6 supports API 29-36 + # Pixel 6 supports API 29-37 - device: pixel-6 api-level: "29" - device: pixel-6 @@ -48,6 +48,8 @@ jobs: api-level: "35" - device: pixel-6 api-level: "36" + - device: pixel-6 + api-level: "37" # Pixel 6 Pro supports API 33, 35 - device: pixel-6-pro @@ -55,7 +57,7 @@ jobs: - device: pixel-6-pro api-level: "35" - # Pixel 7 supports API 33-36 + # Pixel 7 supports API 33-37 - device: pixel-7 api-level: "33" - device: pixel-7 @@ -64,13 +66,15 @@ jobs: api-level: "35" - device: pixel-7 api-level: "36" + - device: pixel-7 + api-level: "37" # Google Play: only pixel-7 / API 34 is supported - device: pixel-7 api-level: "34" google-play: true - # Pixel 7 Pro supports API 33-36 + # Pixel 7 Pro supports API 33-37 - device: pixel-7-pro api-level: "33" - device: pixel-7-pro @@ -79,10 +83,14 @@ jobs: api-level: "35" - device: pixel-7-pro api-level: "36" + - device: pixel-7-pro + api-level: "37" - # Generic Tablet supports API 33 only + # Generic Tablet supports API 33 and 36 - device: generic-tablet api-level: "33" + - device: generic-tablet + api-level: "36" steps: diff --git a/.github/workflows/android-devices-matrix-gpu1.yml b/.github/workflows/android-devices-matrix-gpu1.yml index a45082f..1fde526 100644 --- a/.github/workflows/android-devices-matrix-gpu1.yml +++ b/.github/workflows/android-devices-matrix-gpu1.yml @@ -31,33 +31,39 @@ jobs: fail-fast: false matrix: include: - # Pixel 6 API 34-36 + # Pixel 6 API 34-37 - device: pixel-6 api-level: "34" - device: pixel-6 api-level: "35" - device: pixel-6 api-level: "36" + - device: pixel-6 + api-level: "37" # Pixel 6 Pro API 35 - device: pixel-6-pro api-level: "35" - # Pixel 7 API 34-36 + # Pixel 7 API 34-37 - device: pixel-7 api-level: "34" - device: pixel-7 api-level: "35" - device: pixel-7 api-level: "36" + - device: pixel-7 + api-level: "37" - # Pixel 7 Pro API 34-36 + # Pixel 7 Pro API 34-37 - device: pixel-7-pro api-level: "34" - device: pixel-7-pro api-level: "35" - device: pixel-7-pro api-level: "36" + - device: pixel-7-pro + api-level: "37" steps: diff --git a/.github/workflows/android-devices-matrix-m1.yml b/.github/workflows/android-devices-matrix-m1.yml index fc15f92..f7d39be 100644 --- a/.github/workflows/android-devices-matrix-m1.yml +++ b/.github/workflows/android-devices-matrix-m1.yml @@ -23,9 +23,43 @@ on: jobs: test-android-devices: - name: pixel-7 - API 34 + name: ${{ matrix.device }} - API ${{ matrix.api-level }} runs-on: ubuntu-latest + strategy: + # Do not cancel all jobs if one fails + fail-fast: false + # Mirrors the Mac AVD matrix (infra ansible/ios/android-update.ansible.yml, + # REQUIRED_ANDROID_AVDS in dcd): API 34+ only on the Macs, no tablet. + matrix: + include: + - device: pixel-6 + api-level: "34" + - device: pixel-6 + api-level: "35" + - device: pixel-6 + api-level: "36" + - device: pixel-6 + api-level: "37" + - device: pixel-6-pro + api-level: "35" + - device: pixel-7 + api-level: "34" + - device: pixel-7 + api-level: "35" + - device: pixel-7 + api-level: "36" + - device: pixel-7 + api-level: "37" + - device: pixel-7-pro + api-level: "34" + - device: pixel-7-pro + api-level: "35" + - device: pixel-7-pro + api-level: "36" + - device: pixel-7-pro + api-level: "37" + steps: - uses: actions/checkout@v3 @@ -36,9 +70,9 @@ jobs: api-url: ${{ github.event.inputs.environment == 'dev' && 'https://api.dev.devicecloud.dev' || '' }} app-file: ./binaries/sample.apk workspace: ./flows/android-flow.yaml - android-device: pixel-7 - android-api-level: "34" + android-device: ${{ matrix.device }} + android-api-level: ${{ matrix.api-level }} runner-type: m1 use-beta: ${{ github.event.inputs.use-beta }} retry: 1 - name: "pixel-7 - Android API 34 Test Run [m1]" + name: "${{ matrix.device }} - Android API ${{ matrix.api-level }} Test Run [m1]" From defe748393537e94d6010fa27d5864d46a87572e Mon Sep 17 00:00:00 2001 From: finalerock44 <77282157+finalerock44@users.noreply.github.com> Date: Thu, 10 Sep 2026 11:36:01 +0100 Subject: [PATCH 2/2] test(chrome): accept the newer omnibox placeholder Chrome shows on API 37 --- flows/chrome-flow.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flows/chrome-flow.yaml b/flows/chrome-flow.yaml index d3e16e4..7ca9b59 100644 --- a/flows/chrome-flow.yaml +++ b/flows/chrome-flow.yaml @@ -3,7 +3,8 @@ appId: com.android.chrome - launchApp - waitForAnimationToEnd - assertVisible: - text: ".*(Search or type URL|Search or type web address).*" + # Chrome on the API 37 image says "Search Google or type URL". + text: ".*(Search or type URL|Search or type web address|Search Google or type URL).*" - tapOn: text: "Got it" optional: true