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

Merge branch 'master' into increase_test_vm_size

increase_test_vm_size
SaitTalhaNisanci 2020-09-22 10:39:37 +03:00 committed by GitHub
parent 425fc46416 dba7e052df
commit 050ef726c1
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