Pass branch name to all build slave scripts

This commit is contained in:
2019-09-02 10:36:28 +02:00
parent ea470dc761
commit 42b23d1c93

View File

@@ -200,24 +200,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=[python_command, update_script, id],
command=[python_command, update_script, id, git_branch],
description='updating',
descriptionDone='updated'))
f.addStep(Compile(command=[python_command, compile_script, id], timeout=3600))
f.addStep(Test(command=[python_command, test_script, id]))
f.addStep(Compile(
command=[python_command, compile_script, id, git_branch],
timeout=3600))
f.addStep(Test(
command=[python_command, test_script, id, git_branch]))
f.addStep(ShellCommand(
name='package',
command=[python_command,
pack_script,
id,
branch or Interpolate('%(src:blender:branch)s')],
command=[python_command, pack_script, id, git_branch],
description='packaging',
descriptionDone='packaged'))
if rsync:
f.addStep(rsync_step(python_command, id, branch, rsync_script))
f.addStep(rsync_step(python_command, id, git_branch, rsync_script))
else:
f.addStep(FileUpload(name='upload',
workersrc='buildbot_upload.zip',