From b962c6d1cd3e6a8ab5d41218da0db6cacfff6c03 Mon Sep 17 00:00:00 2001
From: Russell Martin <russell@rjm.li>
Date: Wed, 22 May 2024 17:46:38 -0400
Subject: [PATCH] Implement action to setup Android emulator in CI

---
 .github/workflows/ci.yml | 16 +++++++++++++---
 changes/2597.misc.rst    |  1 +
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 changes/2597.misc.rst

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 551b78e478..f248f9325b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -281,12 +281,22 @@ jobs:
         python -m pip install -U pip
         python -m pip install git+https://github.com/beeware/briefcase.git
 
+    - name: Setup Android Emulator
+      id: emulator
+      if: matrix.backend == 'android'
+      uses: rmartin16/.github-beeware/.github/actions/setup-android@setup-android
+      with:
+        emulator-config: '{"avd":"beePhone","skin":"pixel_3a"}'
+
     - name: Test App
       working-directory: testbed
       timeout-minutes: 15
-      run: |
-        ${{ matrix.briefcase-run-prefix }} \
-          briefcase run ${{ matrix.platform }} --test ${{ matrix.briefcase-run-args }}
+      run: >
+        ${{ matrix.briefcase-run-prefix }}
+        briefcase run ${{ matrix.platform }}
+        --test
+        ${{ matrix.briefcase-run-args }}
+        ${{ steps.emulator.outputs.briefcase-run-args }}
 
     - name: Upload Logs
       uses: actions/upload-artifact@v4.3.3
diff --git a/changes/2597.misc.rst b/changes/2597.misc.rst
new file mode 100644
index 0000000000..f3c470e6de
--- /dev/null
+++ b/changes/2597.misc.rst
@@ -0,0 +1 @@
+CI now uses a centralized action to configure the environment for using the Android emulator.