fix: save Android AVD cache after harness runs

Author: V3RON

action.yml

@@ -131,15 +131,6 @@ runs:
           ~/.android/avd
           ~/.android/adb*
         key: ${{ steps.avd-key.outputs.key }}
-    - name: Save AVD cache
-      if: ${{ always() && fromJson(steps.load-config.outputs.config).platformId == 'android' && fromJson(steps.load-config.outputs.config).config.device.type == 'emulator' && fromJson(steps.load-config.outputs.config).action.avdCachingEnabled && steps.avd-cache.outputs.cache-hit != 'true' }}
-      uses: actions/cache/save@v4
-      with:
-        path: |
-          ~/.android/avd
-          ~/.android/adb*
-        key: ${{ steps.avd-key.outputs.key }}
-
     # ── Web ──────────────────────────────────────────────────────────────────
     - name: Install Playwright Browsers
       if: fromJson(steps.load-config.outputs.config).platformId == 'web'
@@ -228,6 +219,14 @@ runs:
           ${{ steps.load-config.outputs.projectRoot }}/**/__image_snapshots__/**/*-diff.png
           ${{ steps.load-config.outputs.projectRoot }}/**/__image_snapshots__/**/*-actual.png
         if-no-files-found: ignore
+    - name: Save AVD cache
+      if: ${{ always() && fromJson(steps.load-config.outputs.config).platformId == 'android' && fromJson(steps.load-config.outputs.config).config.device.type == 'emulator' && fromJson(steps.load-config.outputs.config).action.avdCachingEnabled && steps.avd-cache.outputs.cache-hit != 'true' }}
+      uses: actions/cache/save@v4
+      with:
+        path: |
+          ~/.android/avd
+          ~/.android/adb*
+        key: ${{ steps.avd-key.outputs.key }}
     - name: Upload crash report artifacts
       if: always()
       uses: actions/upload-artifact@v4

packages/github-action/src/action.yml

@@ -131,15 +131,6 @@ runs:
           ~/.android/avd
           ~/.android/adb*
         key: ${{ steps.avd-key.outputs.key }}
-    - name: Save AVD cache
-      if: ${{ always() && fromJson(steps.load-config.outputs.config).platformId == 'android' && fromJson(steps.load-config.outputs.config).config.device.type == 'emulator' && fromJson(steps.load-config.outputs.config).action.avdCachingEnabled && steps.avd-cache.outputs.cache-hit != 'true' }}
-      uses: actions/cache/save@v4
-      with:
-        path: |
-          ~/.android/avd
-          ~/.android/adb*
-        key: ${{ steps.avd-key.outputs.key }}
-
     # ── Web ──────────────────────────────────────────────────────────────────
     - name: Install Playwright Browsers
       if: fromJson(steps.load-config.outputs.config).platformId == 'web'
@@ -228,6 +219,14 @@ runs:
           ${{ steps.load-config.outputs.projectRoot }}/**/__image_snapshots__/**/*-diff.png
           ${{ steps.load-config.outputs.projectRoot }}/**/__image_snapshots__/**/*-actual.png
         if-no-files-found: ignore
+    - name: Save AVD cache
+      if: ${{ always() && fromJson(steps.load-config.outputs.config).platformId == 'android' && fromJson(steps.load-config.outputs.config).config.device.type == 'emulator' && fromJson(steps.load-config.outputs.config).action.avdCachingEnabled && steps.avd-cache.outputs.cache-hit != 'true' }}
+      uses: actions/cache/save@v4
+      with:
+        path: |
+          ~/.android/avd
+          ~/.android/adb*
+        key: ${{ steps.avd-key.outputs.key }}
     - name: Upload crash report artifacts
       if: always()
       uses: actions/upload-artifact@v4

packages/github-action/src/android/action.yml

@@ -105,14 +105,6 @@ runs:
           ~/.android/avd
           ~/.android/adb*
         key: ${{ steps.avd-key.outputs.key }}
-    - name: Save AVD cache
-      if: ${{ always() && fromJson(steps.load-config.outputs.config).config.device.type == 'emulator' && fromJson(steps.load-config.outputs.config).action.avdCachingEnabled && steps.avd-cache.outputs.cache-hit != 'true' }}
-      uses: actions/cache/save@v4
-      with:
-        path: |
-          ~/.android/avd
-          ~/.android/adb*
-        key: ${{ steps.avd-key.outputs.key }}
     - name: Detect Package Manager
       id: detect-pm
       shell: bash
@@ -165,6 +157,14 @@ runs:
           ${{ inputs.projectRoot }}/**/__image_snapshots__/**/*-diff.png
           ${{ inputs.projectRoot }}/**/__image_snapshots__/**/*-actual.png
         if-no-files-found: ignore
+    - name: Save AVD cache
+      if: ${{ always() && fromJson(steps.load-config.outputs.config).config.device.type == 'emulator' && fromJson(steps.load-config.outputs.config).action.avdCachingEnabled && steps.avd-cache.outputs.cache-hit != 'true' }}
+      uses: actions/cache/save@v4
+      with:
+        path: |
+          ~/.android/avd
+          ~/.android/adb*
+        key: ${{ steps.avd-key.outputs.key }}
     - name: Upload crash report artifacts
       if: always()
       uses: actions/upload-artifact@v4

packages/platform-android/src/__tests__/ci-action.test.ts

@@ -44,6 +44,22 @@ describe('Android GitHub action config', () => {
     }
   });
 
+  it('saves the AVD cache after the Harness run step', async () => {
+    const [rootAction, packageAction] = await Promise.all([
+      readFile(path.join(workspaceRoot, 'action.yml'), 'utf8'),
+      readFile(
+        path.join(workspaceRoot, 'packages/github-action/src/action.yml'),
+        'utf8'
+      ),
+    ]);
+
+    for (const actionYaml of [rootAction, packageAction]) {
+      expect(actionYaml.indexOf('- name: Run E2E tests')).toBeLessThan(
+        actionYaml.indexOf('- name: Save AVD cache')
+      );
+    }
+  });
+
   it('uses a cache key that includes the emulator name', async () => {
     const [rootAction, packageAction] = await Promise.all([
       readFile(path.join(workspaceRoot, 'action.yml'), 'utf8'),