sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: adjust conditions in Check Merge Fast-Forward Only action

Browse Source
This commit is contained in:
UdjinM6 2024-10-23 21:19:28 +03:00
parent 90ced24f4a
commit 8865686132
No known key found for this signature in database
GPG Key ID: 83592BD1400D58D9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/merge-check.yml vendored
View File

@ -27,7 +27,7 @@ jobs:
run: | run: |
git fetch origin master:master git fetch origin master:master
git checkout master git checkout master
if [ "${{ github.event_name }}" == "pull_request" ]; then if [[ "${{ github.event_name }}" == "pull_request"* ]]; then
git merge --ff-only ${{ github.event.pull_request.head.sha }} git merge --ff-only ${{ github.event.pull_request.head.sha }}
else else
git merge --ff-only ${{ github.sha }} git merge --ff-only ${{ github.sha }}