From bfa4140593c43a47f46657c7a635adc1b78e8467 Mon Sep 17 00:00:00 2001
From: matt korwel <matt.korwel@gmail.com>
Date: Thu, 18 Sep 2025 18:22:54 -0700
Subject: [PATCH] more patching (#8787)

---
 .github/actions/publish-release/action.yml      | 9 +++++++++
 .github/workflows/e2e.yml                       | 5 +++++
 .github/workflows/release-patch-1-create-pr.yml | 1 +
 .gitignore                                      | 3 +++
 4 files changed, 18 insertions(+)

diff --git a/.github/actions/publish-release/action.yml b/.github/actions/publish-release/action.yml
index 14af62f8ae..0dd3c75171 100644
--- a/.github/actions/publish-release/action.yml
+++ b/.github/actions/publish-release/action.yml
@@ -149,3 +149,12 @@ runs:
           --title "Release ${{ inputs.release-tag }}" \
           --notes-start-tag "${{ inputs.previous-tag }}" \
           --generate-notes
+
+    - name: '🧹 Clean up release branch'
+      working-directory: '${{ inputs.working-directory }}'
+      if: "${{ inputs.dry-run == 'false' }}"
+      continue-on-error: true
+      shell: 'bash'
+      run: |
+        echo "Cleaning up release branch ${{ steps.release_branch.outputs.BRANCH_NAME }}..."
+        git push origin --delete "${{ steps.release_branch.outputs.BRANCH_NAME }}"
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 5127836ff3..7f88366bf6 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -14,6 +14,11 @@ on:
     types: ['labeled']
   merge_group:
 
+concurrency:
+  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
+  cancel-in-progress: |-
+    ${{ github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/release/') }}
+
 jobs:
   merge_queue_skipper:
     name: 'Merge Queue Skipper'
diff --git a/.github/workflows/release-patch-1-create-pr.yml b/.github/workflows/release-patch-1-create-pr.yml
index b5b4afbd38..e4461fd1e8 100644
--- a/.github/workflows/release-patch-1-create-pr.yml
+++ b/.github/workflows/release-patch-1-create-pr.yml
@@ -87,4 +87,5 @@ jobs:
           REPOSITORY: '${{ github.repository }}'
           GITHUB_RUN_ID: '${{ github.run_id }}'
         run: |
+          git checkout '${{ github.event.inputs.ref }}'
           node scripts/releasing/patch-create-comment.js
diff --git a/.gitignore b/.gitignore
index 47d9f9bd33..d44f7ad349 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,6 @@ packages/vscode-ide-companion/*.vsix
 
 # GHA credentials
 gha-creds-*.json
+
+# Log files
+patch_output.log