From 0a6906626963b90087ffc77203b909a80c11abe4 Mon Sep 17 00:00:00 2001
From: Alfonso Noriega <alfonso.noriega@shopify.com>
Date: Thu, 25 Jun 2026 16:52:58 +0200
Subject: [PATCH] Run current-run E2E app cleanup in CI

Assisted-By: devx/3c9d2be5-81a1-4ad5-90ba-4155c6ff125d
---
 .github/workflows/tests-pr.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/tests-pr.yml b/.github/workflows/tests-pr.yml
index 88d1e4f2ae3..77868e965c2 100644
--- a/.github/workflows/tests-pr.yml
+++ b/.github/workflows/tests-pr.yml
@@ -254,6 +254,16 @@ jobs:
           E2E_STORE_FQDN: ${{ secrets.E2E_STORE_FQDN }}
           E2E_ORG_ID: ${{ secrets.E2E_ORG_ID }}
         run: pnpm exec playwright test --shard ${{ matrix.shard }}
+      - name: Cleanup current-run E2E apps
+        if: ${{ always() }}
+        continue-on-error: true
+        env:
+          E2E_ACCOUNT_EMAIL: ${{ secrets.E2E_ACCOUNT_EMAIL }}
+          E2E_ACCOUNT_PASSWORD: ${{ secrets.E2E_ACCOUNT_PASSWORD }}
+          E2E_ORG_ID: ${{ secrets.E2E_ORG_ID }}
+        run: |
+          RUN_TOKEN=$(node -e "process.stdout.write(BigInt(process.env.GITHUB_RUN_ID).toString(36))")
+          pnpm --filter e2e exec tsx scripts/cleanup-apps.ts --pattern "r${RUN_TOKEN}a${GITHUB_RUN_ATTEMPT}"
       - name: Upload Playwright report
         uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}