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

ci: do not check --ff-only on master branch

Browse Source
This commit is contained in:
UdjinM6 2024-12-13 12:33:11 +03:00
parent 779e4295ad
commit dcc1ff37bc
No known key found for this signature in database
GPG Key ID: 83592BD1400D58D9
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,16 +25,20 @@ jobs:
- name: Check merge --ff-only - name: Check merge --ff-only
run: | run: |
git fetch origin master:master if [[ "${{ github.ref_name }}" == "master" ]]; then
if [[ "${{ github.event_name }}" == "pull_request"* ]]; then echo "Already on master, no need to check --ff-only"
git fetch origin ${{ github.event.pull_request.base.ref }}:base_branch
git checkout base_branch
git pull --rebase=false origin pull/${{ github.event.pull_request.number }}/head
git checkout master
git merge --ff-only base_branch
else else
git checkout master git fetch origin master:master
git merge --ff-only ${{ github.sha }} if [[ "${{ github.event_name }}" == "pull_request"* ]]; then
git fetch origin ${{ github.event.pull_request.base.ref }}:base_branch
git checkout base_branch
git pull --rebase=false origin pull/${{ github.event.pull_request.number }}/head
git checkout master
git merge --ff-only base_branch
else
git checkout master
git merge --ff-only ${{ github.sha }}
fi
fi fi
- name: add labels - name: add labels