Skip to content

Commit 7acec72

Browse files
committed
feat: fail action on failed merge
1 parent 5702b7d commit 7acec72

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

.github/actions/merge-main/action.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ runs:
8686
return
8787
fi
8888
89+
failed="false"
90+
8991
for branch in "${branches[@]}"; do
9092
echo "...switching to branch: $branch"
9193
git switch "$branch"
@@ -95,9 +97,14 @@ runs:
9597
git push origin "$branch"
9698
else
9799
echo "...merge failed"
100+
failed="true"
98101
git merge --abort
99102
fi
100103
done
104+
105+
if [ "$failed" == "true" ]; then
106+
exit -1
107+
fi
101108
}
102109
103110
merge_main

0 commit comments

Comments
 (0)