marked/jecs-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add check before trying to merge PR

Browse source
This commit is contained in:
marked 2025-03-02 19:29:28 +01:00
parent 9d968eaa8b
commit 849d2f361a
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.forgejo/workflows/release.yml
View file

@ -96,6 +96,9 @@ jobs:
token: ${{ secrets.privileged_forgejo_token }} token: ${{ secrets.privileged_forgejo_token }}
- name: Merge Pull Request - name: Merge Pull Request
shell: bash
run: | run: |
fj --host git.devmarked.win auth add-key marked ${{ secrets.privileged_forgejo_token }} if [ ! -z "${{ steps.create_pull_request.outputs.pull-request-number }}" ]; then
fj --host git.devmarked.win pr merge --method squash "${{ steps.create_pull_request.outputs.pull-request-number }}" 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