Adds cleanup to emu setup script.

dropbox · Apr 30, 2024 · 493ba8c · 493ba8c
1 parent dc2fe63
commit 493ba8c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/scripts/emu_setup.sh b/.github/scripts/emu_setup.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+echo "Cleaning up old emulator data"
+adb uninstall com.dropbox.dropshots.test || true
+adb shell rm -rf /storage/emulated/0/Download/screenshots || true
+
 adb wait-for-devices
 adb shell settings put global sysui_demo_allowed 1
 adb shell am broadcast -a com.android.systemui.demo -e command enter

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -163,7 +163,7 @@ jobs:
           ram-size: 4096M
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           # Workaround for https://github.com/ReactiveCircus/android-emulator-runner/issues/319
-          script: adb uninstall com.dropbox.dropshots.test; ./.github/scripts/emu_setup.sh && ./gradlew connectedCheck --stacktrace
+          script: ./.github/scripts/emu_setup.sh && ./gradlew connectedCheck --stacktrace
 
       - name: Prevent pushing new screenshots if this is a fork
         id: checkfork_screenshots
@@ -185,7 +185,7 @@ jobs:
           ram-size: 4096M
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           # Workaround for https://github.com/ReactiveCircus/android-emulator-runner/issues/319
-          script: adb uninstall com.dropbox.dropshots.test; ./.github/scripts/emu_setup.sh && ./gradlew connectedCheck -Pdropshots.record --stacktrace
+          script: ./.github/scripts/emu_setup.sh && ./gradlew connectedCheck -Pdropshots.record --stacktrace
 
       - name: Pull screenshots
         id: screenshotspull