From bb074228e6ea30604c31cee987c874f06b43ab33 Mon Sep 17 00:00:00 2001 From: Sayali Gaikawad Date: Wed, 18 Sep 2024 13:57:57 -0700 Subject: [PATCH] Refactor merged branch deletion Signed-off-by: Sayali Gaikawad --- .github/workflows/delete-backport-branch.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/delete-backport-branch.yml b/.github/workflows/delete-backport-branch.yml index 2e34a76f5..20d9b6768 100644 --- a/.github/workflows/delete-backport-branch.yml +++ b/.github/workflows/delete-backport-branch.yml @@ -8,9 +8,25 @@ on: jobs: delete-branch: runs-on: ubuntu-latest +<<<<<<< Updated upstream if: startsWith(github.event.pull_request.head.ref,'backport/') steps: - name: Delete merged branch uses: SvanBoxel/delete-merged-branch@main env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +======= + permissions: + contents: write + if: startsWith(github.event.pull_request.head.ref,'backport/') + steps: + - name: Delete branch + uses: actions/github-script@v5 + with: + script: | + github.rest.git.deleteRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: `heads/${context.payload.pull_request.head.ref}`, + }) +>>>>>>> Stashed changes