Add check before trying to merge PR
This commit is contained in:
parent
9d968eaa8b
commit
849d2f361a
1 changed files with 5 additions and 2 deletions
|
@ -96,6 +96,9 @@ jobs:
|
|||
token: ${{ secrets.privileged_forgejo_token }}
|
||||
|
||||
- name: Merge Pull Request
|
||||
shell: bash
|
||||
run: |
|
||||
fj --host git.devmarked.win auth add-key marked ${{ secrets.privileged_forgejo_token }}
|
||||
fj --host git.devmarked.win pr merge --method squash "${{ steps.create_pull_request.outputs.pull-request-number }}"
|
||||
if [ ! -z "${{ steps.create_pull_request.outputs.pull-request-number }}" ]; then
|
||||
fj --host git.devmarked.win auth add-key marked ${{ secrets.privileged_forgejo_token }}
|
||||
fj --host git.devmarked.win pr merge --method squash "${{ steps.create_pull_request.outputs.pull-request-number }}"
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue