From dba7e052df73022ea2c72ef831d92cfedfebe3bd Mon Sep 17 00:00:00 2001 From: SaitTalhaNisanci Date: Mon, 21 Sep 2020 19:31:10 +0300 Subject: [PATCH] Merge enterprise branch if it exists (#4181) * Merge enterprise branch if it exists We should merge the enterprise branch if it exists in the check enterpise merge job, otherwise the following can happen: - there is some change on community that breaks the compilation on enterprise without creating any conflicts - we fix the compilation issue by opening a branch on enterprise - the job doesn't see the enterprise specific fix because it doesn't try to merge enterprise branch if there are no conflicts * Update ci/check_enterprise_merge.sh Co-authored-by: Jelte Fennema * Simplify the steps Co-authored-by: Jelte Fennema --- ci/check_enterprise_merge.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ci/check_enterprise_merge.sh b/ci/check_enterprise_merge.sh index f70d64cc1..097e1aed5 100755 --- a/ci/check_enterprise_merge.sh +++ b/ci/check_enterprise_merge.sh @@ -55,8 +55,11 @@ git checkout "enterprise/enterprise-master" if git merge --no-commit "origin/$PR_BRANCH"; then echo "INFO: community PR branch could be merged into enterprise-master" # check that we can compile after the merge - check_compile - exit 0 + if check_compile; then + exit 0 + fi + + echo "WARN: Failed to compile after community PR branch was merged into enterprise" fi # undo partial merge