From a8311538a875bf68d142c07340cece08bea8ed5f Mon Sep 17 00:00:00 2001
From: Tim Hess <tim.hess@broadcom.com>
Date: Fri, 30 Jan 2026 14:34:27 -0600
Subject: [PATCH] For PR cleanup: collect output of slot deletion and delete GH
 env

---
 .github/workflows/pr-cleanup.yml | 42 ++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pr-cleanup.yml b/.github/workflows/pr-cleanup.yml
index 337a717..abf0ab9 100644
--- a/.github/workflows/pr-cleanup.yml
+++ b/.github/workflows/pr-cleanup.yml
@@ -5,6 +5,10 @@ on:
     types:
     - closed
 
+concurrency:
+  group: ci-${{ github.event.number }}
+  cancel-in-progress: true
+
 env:
   SLOT_NAME: pr-${{ github.event.number }}
 
@@ -18,16 +22,38 @@ jobs:
       with:
         creds: ${{ secrets.AZURE_CREDENTIALS }}
 
-    - name: Delete slot on staging site
-      run: az webapp deployment slot delete --resource-group ${{ vars.AZURE_RESOURCE_GROUP }} --name ${{ vars.AZURE_WEBAPP_NAME}} --slot ${{ env.SLOT_NAME }}
+
+    - name: Delete staging slot
+      id: delete-slot
+      continue-on-error: true
+      run: |
+        az webapp deployment slot delete \
+          --resource-group ${{ vars.AZURE_RESOURCE_GROUP }} \
+          --name ${{ vars.AZURE_WWW_NAME }} \
+          --slot ${{ env.SLOT_NAME }} 2>&1
+
+    - name: Report slot deletion result
+      run: |
+        if [ "${{ steps.delete-slot.outcome }}" == "success" ]; then
+          echo "::notice::Successfully deleted slot ${{ env.SLOT_NAME }}"
+        else
+          echo "::error::Failed to delete slot ${{ env.SLOT_NAME }}"
+          exit 1
+        fi
 
   delete-deployment:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Delete Deployment Environment
-        uses: strumwolf/delete-deployment-environment@v3
-        with:
-          environment: "pr-${{ github.event.number }}"
-          token: ${{ secrets.GITHUB_TOKEN }}
-          onlyRemoveDeployments: true
+    - name: Generate GitHub App Token
+      id: app-token
+      uses: actions/create-github-app-token@v1
+      with:
+        app-id: ${{ secrets.ENV_CLEANUP_APP_ID }}
+        private-key: ${{ secrets.ENV_CLEANUP_APP_PRIVATE_KEY }}
+
+    - name: Delete Deployment Environment
+      uses: strumwolf/delete-deployment-environment@v3
+      with:
+        environment: "pr-${{ github.event.number }}"
+        token: ${{ steps.app-token.outputs.token }}