mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 19:42:46 +01:00
fix: adjust conditions in Check Merge Fast-Forward Only
action
This commit is contained in:
parent
90ced24f4a
commit
8865686132
2
.github/workflows/merge-check.yml
vendored
2
.github/workflows/merge-check.yml
vendored
@ -27,7 +27,7 @@ jobs:
|
||||
run: |
|
||||
git fetch origin master: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 }}
|
||||
else
|
||||
git merge --ff-only ${{ github.sha }}
|
||||
|
Loading…
Reference in New Issue
Block a user