Commit ebccf431 authored by Luke Campagnola's avatar Luke Campagnola
Browse files

Update merge test to auto-check against github repo

parent d940b956
......@@ -244,16 +244,21 @@ def unitTests():
return ret
def checkMergeSize(sourceBranch=None, targetBranch='develop', sourceRepo=None, targetRepo=None):
def checkMergeSize(sourceBranch=None, targetBranch=None, sourceRepo=None, targetRepo=None):
Check that a git merge would not increase the repository size by MERGE_SIZE_LIMIT.
if sourceBranch is None:
sourceBranch = getGitBranch()
if sourceRepo is None:
sourceRepo = '..'
if targetRepo is None:
targetRepo = '..'
if targetBranch is None:
if sourceBranch == 'develop':
targetBranch = 'develop'
targetRepo = ''
targetBranch = 'develop'
targetRepo = '..'
workingDir = '__merge-test-clone'
env = dict(TARGET_BRANCH=targetBranch,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment