diff options
Diffstat (limited to 'build_files/buildbot/master.cfg')
| -rw-r--r-- | build_files/buildbot/master.cfg | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 6b7191cd57b..e3101430e50 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -4,10 +4,10 @@ # <pep8 compliant> # List of the branches being built automatically overnight -NIGHT_SCHEDULE_BRANCHES = [None] +NIGHT_SCHEDULE_BRANCHES = [None, "blender2.8"] # List of the branches available for force build -FORCE_SCHEDULE_BRANCHES = ["master", "gooseberry", "experimental-build"] +FORCE_SCHEDULE_BRANCHES = ["master", "blender2.8", "experimental-build"] """ Stock Twisted directory lister doesn't provide any information about last file @@ -127,7 +127,14 @@ def schedule_force_build(name): project=forcesched.FixedParameter(name="project", default="", hide=True)), # For now, hide other codebases. forcesched.CodebaseParameter(hide=True, codebase="blender-translations"), - forcesched.CodebaseParameter(hide=True, codebase="blender-addons"), + forcesched.CodebaseParameter( + codebase="blender-addons", + branch=forcesched.ChoiceStringParameter( + name="branch", choices=["master", "blender2.8"], default="master"), + repository=forcesched.FixedParameter(name="repository", default="", hide=True), + project=forcesched.FixedParameter(name="project", default="", hide=True), + revision=forcesched.FixedParameter(name="revision", default="", hide=True), + ), forcesched.CodebaseParameter(hide=True, codebase="blender-addons-contrib"), forcesched.CodebaseParameter(hide=True, codebase="blender-dev-tools"), forcesched.CodebaseParameter(hide=True, codebase="lib svn")], @@ -139,11 +146,15 @@ def schedule_build(name, hour, minute=0): scheduler_name = "nightly " + name if current_branch: scheduler_name += ' ' + current_branch + # Use special addons submodule branch when building blender2.8 branch. + addons_branch = "master" + if current_branch == "blender2.8": + addons_branch = "blender2.8" c['schedulers'].append(timed.Nightly(name=scheduler_name, codebases={ "blender": {"repository": ""}, "blender-translations": {"repository": "", "branch": "master"}, - "blender-addons": {"repository": "", "branch": "master"}, + "blender-addons": {"repository": "", "branch": addons_branch}, "blender-addons-contrib": {"repository": "", "branch": "master"}, "blender-dev-tools": {"repository": "", "branch": "master"}, "lib svn": {"repository": "", "branch": "trunk"}}, @@ -225,8 +236,7 @@ def git_step(branch=''): def git_submodules_update(): - command = ['git', 'submodule', 'foreach', '--recursive', - 'git', 'pull', 'origin', 'master'] + command = ['git', 'submodule', 'update', '--remote'] return ShellCommand(name='Submodules Update', command=command, description='updating', @@ -286,7 +296,7 @@ def generic_builder(id, libdir='', branch='', rsync=False): f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, - maxsize=150 * 1024 * 1024, + maxsize=180 * 1024 * 1024, workdir='install')) f.addStep(MasterShellCommand(name='unpack', command=['python2.7', unpack_script, filename], @@ -296,15 +306,13 @@ def generic_builder(id, libdir='', branch='', rsync=False): # Builders -add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=5) -add_builder(c, 'linux_glibc211_i686_cmake', '', generic_builder, hour=1) -add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2) -add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=3) -add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=4) -add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=3) -add_builder(c, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=4) -add_builder(c, 'win32_cmake_vc2015', 'windows_vc14', generic_builder, hour=5) -add_builder(c, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=6) +add_builder(c, 'mac_x86_64_10_9_cmake', 'darwin', generic_builder, hour=1) +add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=2) +add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=1) +add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=1) +add_builder(c, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=2) +add_builder(c, 'win32_cmake_vc2015', 'windows_vc14', generic_builder, hour=3) +add_builder(c, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=4) # STATUS TARGETS # |