Merge pull request gooddata#454 from hkad98/trivial

TRIVIAL: delete branch only if it exists Reviewed-by: https://github.com/Mara3l
hkad98 · Nov 23, 2023 · 3de240d · 3de240d
2 parents ae8f951 + 92ed9de
commit 3de240d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.github/actions/merge/action.yaml b/.github/actions/merge/action.yaml
@@ -53,7 +53,6 @@ runs:
       shell: bash
       id: push
     - name: Create the promote/backmerge PR
-      id: pr
       run: |
         gh pr create \
           --title "[bot] Merge ${{ inputs.source }}/${{ steps.push.outputs.short }} into ${{ inputs.target }}" \
@@ -71,7 +70,12 @@ runs:
         GH_TOKEN: ${{ inputs.token_pr }}
     - name: Delete the source branch
       if: ${{ inputs.merge == 'true' && inputs.delete_branch == 'true' }}
-      run: git push origin -d ${{ steps.push.outputs.branch }}
+      run: |
+        if git show-ref --verify --quiet refs/heads/${{ steps.push.outputs.branch }}; then
+          git branch -d ${{ steps.push.outputs.branch }}
+        else
+          echo "Nothing to delete. Branch ${{ steps.push.outputs.branch }} does not exist."
+        fi
       shell: bash
       env:
           GH_TOKEN: ${{ inputs.token_pr }}