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

cypress-io · Jun 4, 2021 · 30d0b33 · 30d0b33
1 parent 5c9fb0b
commit 30d0b33
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 }}