diff --git a/master.cfg b/master.cfg index aefee95..6fdaa23 100644 --- a/master.cfg +++ b/master.cfg @@ -209,24 +209,27 @@ def generic_builder(id, branch='', rsync=False): f.addStep(git_step(branch)) + git_branch = branch or Interpolate('%(src:blender:branch)s') + f.addStep(ShellCommand( name='submodules and libraries update', - command=['python3', update_script, id], + command=['python3', update_script, id, git_branch], description='updating', descriptionDone='updated')) - f.addStep(Compile(command=['python3', compile_script, id], timeout=3600)) - f.addStep(Test(command=['python3', test_script, id])) + f.addStep(Compile( + command=['python3', compile_script, id, git_branch], + timeout=3600)) + f.addStep(Test( + command=['python3', test_script, id, git_branch])) f.addStep(ShellCommand( name='package', - command=['python3', - pack_script, - id, - branch or Interpolate('%(src:blender:branch)s')], + command=['python3', pack_script, id, git_branch], description='packaging', descriptionDone='packaged')) + if rsync: - f.addStep(rsync_step(id, branch, rsync_script)) + f.addStep(rsync_step(id, git_branch, rsync_script)) else: f.addStep(FileUpload(name='upload', workersrc='buildbot_upload.zip',