Buildbot: pass --codesign parameter required by latest worker scripts
This commit is contained in:
31
master.cfg
31
master.cfg
@@ -226,6 +226,20 @@ def git_step(branch=''):
|
||||
|
||||
# Generic builder.
|
||||
|
||||
@util.renderer
|
||||
def script_command(props, script, id, branch):
|
||||
# NOTE: On Windows never includes major version in the executable name,
|
||||
# so Python 3 will have be 'python.exe'.
|
||||
if id.startswith('win'):
|
||||
python_command = 'python'
|
||||
else:
|
||||
python_command = 'python3'
|
||||
|
||||
git_branch = branch or Interpolate('%(src:blender:branch)s')
|
||||
args = [python_command, script, id, git_branch, '--codesign']
|
||||
|
||||
return args
|
||||
|
||||
def generic_builder(id, branch=''):
|
||||
# TODO(sergey): Consider using pathlib.
|
||||
filename = f'uploaded/buildbot_upload_{id}.zip'
|
||||
@@ -235,33 +249,24 @@ def generic_builder(id, branch=''):
|
||||
pack_script = '../blender.git/build_files/buildbot/worker_pack.py'
|
||||
unpack_script = 'master_unpack.py'
|
||||
|
||||
# NOTE: On Windows never includes major version in the executable name,
|
||||
# so Python 3 will have be 'python.exe'.
|
||||
if id.startswith('win'):
|
||||
python_command = 'python'
|
||||
else:
|
||||
python_command = 'python3'
|
||||
|
||||
f = BuildFactory()
|
||||
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, git_branch],
|
||||
command=script_command.withArgs(update_script, id, branch),
|
||||
description='updating',
|
||||
descriptionDone='updated',
|
||||
haltOnFailure=True))
|
||||
|
||||
f.addStep(Compile(
|
||||
command=[python_command, compile_script, id, git_branch],
|
||||
command=script_command.withArgs(compile_script, id, branch),
|
||||
timeout=3600))
|
||||
f.addStep(Test(
|
||||
command=[python_command, test_script, id, git_branch]))
|
||||
command=script_command.withArgs(test_script, id, branch)))
|
||||
f.addStep(ShellCommand(
|
||||
name='package',
|
||||
command=[python_command, pack_script, id, git_branch],
|
||||
command=script_command.withArgs(pack_script, id, branch),
|
||||
description='packaging',
|
||||
descriptionDone='packaged',
|
||||
haltOnFailure=True))
|
||||
|
Reference in New Issue
Block a user