sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +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

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

@ -25,6 +25,9 @@ jobs:
- name: Check merge --ff-only - name: Check merge --ff-only
run: | run: |
if [[ "${{ github.ref_name }}" == "master" ]]; then
echo "Already on master, no need to check --ff-only"
else
git fetch origin master:master git fetch origin master:master
if [[ "${{ github.event_name }}" == "pull_request"* ]]; then if [[ "${{ github.event_name }}" == "pull_request"* ]]; then
git fetch origin ${{ github.event.pull_request.base.ref }}:base_branch git fetch origin ${{ github.event.pull_request.base.ref }}:base_branch
@ -36,6 +39,7 @@ jobs:
git checkout master git checkout master
git merge --ff-only ${{ github.sha }} git merge --ff-only ${{ github.sha }}
fi fi
fi
- name: add labels - name: add labels
uses: actions-ecosystem/action-add-labels@v1 uses: actions-ecosystem/action-add-labels@v1