From 2f5e8bec353eb36df0ae5a570c71fd4150dedf63 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:24:51 +1200 Subject: [PATCH] Fix delete backport branch workflow (#272) (#275) Signed-off-by: Thomas Farr (cherry picked from commit 59d0282239155261c154585fe93b09fa19638fd9) Co-authored-by: Thomas Farr --- .github/workflows/delete_backport_branch.yml | 21 +++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/delete_backport_branch.yml b/.github/workflows/delete_backport_branch.yml index 1f707bff..66a2c1b4 100644 --- a/.github/workflows/delete_backport_branch.yml +++ b/.github/workflows/delete_backport_branch.yml @@ -1,15 +1,22 @@ -name: Delete Merged Branch of the Backport PRs -on: +name: Delete merged branch of the backport PRs +on: pull_request: types: - closed - + jobs: delete-branch: runs-on: ubuntu-latest - if: startsWith(github.event.pull_request.head.ref,'backport/') + if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id && startsWith(github.event.pull_request.head.ref, 'backport/') + permissions: + contents: write steps: - name: Delete merged branch - uses: SvanBoxel/delete-merged-branch@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + 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}`, + }) \ No newline at end of file