From 531966d708180e0767e790986cfa4e90410de0d3 Mon Sep 17 00:00:00 2001 From: Riley Jerger Date: Tue, 12 Aug 2025 21:07:58 +0000 Subject: [PATCH 1/3] 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 f24f022b0..68da56fb2 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 a5bad7a19fbb593fba7e3b49deda7028855d5f06 Mon Sep 17 00:00:00 2001 From: Riley Jerger Date: Wed, 13 Aug 2025 17:55:00 +0000 Subject: [PATCH 2/3] Replace delete-merged-branch action with GitHub script Signed-off-by: Riley Jerger --- .github/workflows/delete_backport_branch.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/delete_backport_branch.yml b/.github/workflows/delete_backport_branch.yml index 68da56fb2..35c5c34ca 100644 --- a/.github/workflows/delete_backport_branch.yml +++ b/.github/workflows/delete_backport_branch.yml @@ -10,6 +10,11 @@ jobs: 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}`, + }) From 71fad29a6e8dc9b42fb72904774bdd7948617bbb Mon Sep 17 00:00:00 2001 From: Riley Jerger Date: Fri, 15 Aug 2025 19:11:31 +0000 Subject: [PATCH 3/3] Update delete_backport_branch workflow to use github-script with proper permissions Signed-off-by: Riley Jerger --- .github/workflows/delete_backport_branch.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/delete_backport_branch.yml b/.github/workflows/delete_backport_branch.yml index 35c5c34ca..9a06c8939 100644 --- a/.github/workflows/delete_backport_branch.yml +++ b/.github/workflows/delete_backport_branch.yml @@ -7,6 +7,8 @@ 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