From 3e1f6b61a71998d86df7ac20e4fc6a1c809e829e Mon Sep 17 00:00:00 2001 From: Riley Jerger Date: Tue, 12 Aug 2025 20:41:19 +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 387a124b..5c25a206 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 11f816aa11c948123b430fd3620884bf18003938 Mon Sep 17 00:00:00 2001 From: Riley Jerger Date: Wed, 13 Aug 2025 18:23:25 +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 5c25a206..b2e618e0 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 d145e35864171aabf163c9f914bd5385338e251d Mon Sep 17 00:00:00 2001 From: Riley Jerger Date: Fri, 15 Aug 2025 18:42:30 +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 b2e618e0..67c91f68 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