From 5ae1ae0ecb328e7f1783b1c31e84924fbde71ccc Mon Sep 17 00:00:00 2001 From: Riley Jerger Date: Tue, 12 Aug 2025 16:49:43 +0000 Subject: [PATCH 1/2] Update delete_backport_branch workflow to include release-chores branches Signed-off-by: Riley Jerger --- .github/workflows/delete_backport_branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/delete_backport_branch.yml b/.github/workflows/delete_backport_branch.yml index 387a124b8..5c25a206e 100644 --- a/.github/workflows/delete_backport_branch.yml +++ b/.github/workflows/delete_backport_branch.yml @@ -7,7 +7,7 @@ on: jobs: delete-branch: runs-on: ubuntu-latest - if: startsWith(github.event.pull_request.head.ref,'backport/') + if: startsWith(github.event.pull_request.head.ref,'backport/') || startsWith(github.event.pull_request.head.ref,'release-chores/') steps: - name: Delete merged branch uses: SvanBoxel/delete-merged-branch@main From d0e91d6fbac3174cfaa0cb95513075887fce42e0 Mon Sep 17 00:00:00 2001 From: Riley Jerger Date: Fri, 15 Aug 2025 17:29:05 +0000 Subject: [PATCH 2/2] Update delete_backport_branch workflow to use github-script with proper permissions Signed-off-by: Riley Jerger --- .github/workflows/delete_backport_branch.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/delete_backport_branch.yml b/.github/workflows/delete_backport_branch.yml index 5c25a206e..67c91f68b 100644 --- a/.github/workflows/delete_backport_branch.yml +++ b/.github/workflows/delete_backport_branch.yml @@ -7,9 +7,16 @@ on: jobs: delete-branch: runs-on: ubuntu-latest + permissions: + pull-requests: write if: startsWith(github.event.pull_request.head.ref,'backport/') || startsWith(github.event.pull_request.head.ref,'release-chores/') steps: - name: Delete merged branch - uses: SvanBoxel/delete-merged-branch@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: actions/github-script@v7 + with: + script: | + github.rest.git.deleteRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: `heads/${context.payload.pull_request.head.ref}`, + })