external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <github-tech@jeltef.nl>

* Simplify the steps

Co-authored-by: Jelte Fennema <github-tech@jeltef.nl>
pull/4174/head
SaitTalhaNisanci 2020-09-21 19:31:10 +03:00 committed by GitHub
parent bc293d9d5e
commit dba7e052df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ci/check_enterprise_merge.sh
View File

@ -55,10 +55,13 @@ git checkout "enterprise/enterprise-master"
if git merge --no-commit "origin/$PR_BRANCH"; then if git merge --no-commit "origin/$PR_BRANCH"; then
echo "INFO: community PR branch could be merged into enterprise-master" echo "INFO: community PR branch could be merged into enterprise-master"
# check that we can compile after the merge # check that we can compile after the merge
check_compile if check_compile; then
exit 0 exit 0
fi fi
echo "WARN: Failed to compile after community PR branch was merged into enterprise"
fi
# undo partial merge # undo partial merge
git merge --abort git merge --abort