mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-01-07 06:59:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

ci: fix merge master into develop failure (#16815)

Browse Source
This commit is contained in:
Barthélémy Ledoux
2021-06-04 17:56:02 -05:00
committed by GitHub
parent 5c9fb0bc34
commit 30d0b3328d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/merge-master-into-develop.yml vendored
View File

@@ -22,8 +22,12 @@ jobs:
id: check-conflict
run: echo "::set-output name=merge_conflict::$(git merge-tree $(git merge-base HEAD master) master HEAD | egrep '<<<<<<<')"
- name: Merge master into develop
id: merge-master
run: git merge master
if: ${{ !steps.check-conflict.outputs.merge_conflict }}
- name: Failed merge, set merged status as failed
run: echo "::set-output name=merge_conflict::'failed merge'"
if: ${{ steps.merge-master.outcome != 'success' }}
- name: Push
run: git push
if: ${{ !steps.check-conflict.outputs.merge_conflict }}