diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 3d5968b..1371fa9 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -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