Merge branch 'master' into develop

cypress-io · Jun 4, 2021 · e0c385e · e0c385e · cypress-bot · Jun 4, 2021
2 parents f08c0c8 + 30d0b33
commit e0c385e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/merge-master-into-develop.yml b/.github/workflows/merge-master-into-develop.yml
@@ -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 }}