Pass branch name to all build slave scripts
This commit is contained in:
19
master.cfg
19
master.cfg
@@ -209,24 +209,27 @@ def generic_builder(id, branch='', rsync=False):
|
|||||||
|
|
||||||
f.addStep(git_step(branch))
|
f.addStep(git_step(branch))
|
||||||
|
|
||||||
|
git_branch = branch or Interpolate('%(src:blender:branch)s')
|
||||||
|
|
||||||
f.addStep(ShellCommand(
|
f.addStep(ShellCommand(
|
||||||
name='submodules and libraries update',
|
name='submodules and libraries update',
|
||||||
command=['python3', update_script, id],
|
command=['python3', update_script, id, git_branch],
|
||||||
description='updating',
|
description='updating',
|
||||||
descriptionDone='updated'))
|
descriptionDone='updated'))
|
||||||
|
|
||||||
f.addStep(Compile(command=['python3', compile_script, id], timeout=3600))
|
f.addStep(Compile(
|
||||||
f.addStep(Test(command=['python3', test_script, id]))
|
command=['python3', compile_script, id, git_branch],
|
||||||
|
timeout=3600))
|
||||||
|
f.addStep(Test(
|
||||||
|
command=['python3', test_script, id, git_branch]))
|
||||||
f.addStep(ShellCommand(
|
f.addStep(ShellCommand(
|
||||||
name='package',
|
name='package',
|
||||||
command=['python3',
|
command=['python3', pack_script, id, git_branch],
|
||||||
pack_script,
|
|
||||||
id,
|
|
||||||
branch or Interpolate('%(src:blender:branch)s')],
|
|
||||||
description='packaging',
|
description='packaging',
|
||||||
descriptionDone='packaged'))
|
descriptionDone='packaged'))
|
||||||
|
|
||||||
if rsync:
|
if rsync:
|
||||||
f.addStep(rsync_step(id, branch, rsync_script))
|
f.addStep(rsync_step(id, git_branch, rsync_script))
|
||||||
else:
|
else:
|
||||||
f.addStep(FileUpload(name='upload',
|
f.addStep(FileUpload(name='upload',
|
||||||
workersrc='buildbot_upload.zip',
|
workersrc='buildbot_upload.zip',
|
||||||
|
Reference in New Issue
Block a user