diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-07-23 21:34:30 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-07-23 22:59:40 +0400 |
| commit | 15b5f84a1e032b4979313151a67b00cd976b9316 (patch) | |
| tree | 9bc95e0413a9a258cc9d3b939638f8672c1d543c /build_files | |
| parent | af162658e1270b7442eb064360d1bec75c621c1a (diff) | |
Buildbot: fix to previous commit, to handle svn libs...
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/master.cfg | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 2e6663ef06c..d5bc8b97f22 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -89,6 +89,7 @@ all_repositories = { r'git://git.blender.org/blender-addons.git': 'blender-addons', r'git://git.blender.org/blender-addons-contrib.git': 'blender-addons-contrib', r'git://git.blender.org/scons.git': 'scons', + r'https://svn.blender.org/svnroot/bf-blender/': 'lib svn', } def codebaseGenerator(chdict): @@ -106,7 +107,6 @@ from buildbot.schedulers import timed, forcesched c['schedulers'] = [] - def schedule_force_build(name): c['schedulers'].append(forcesched.ForceScheduler(name='force ' + name, builderNames=[name], @@ -121,7 +121,8 @@ def schedule_force_build(name): forcesched.CodebaseParameter(hide=True, codebase="blender-translations"), forcesched.CodebaseParameter(hide=True, codebase="blender-addons"), forcesched.CodebaseParameter(hide=True, codebase="blender-addons-contrib"), - forcesched.CodebaseParameter(hide=True, codebase="scons")], + forcesched.CodebaseParameter(hide=True, codebase="scons"), + forcesched.CodebaseParameter(hide=True, codebase="lib svn")], properties=[])) @@ -132,7 +133,8 @@ def schedule_build(name, hour, minute=0): "blender-translations": {"repository": ""}, "blender-addons": {"repository": ""}, "blender-addons-contrib": {"repository": ""}, - "scons": {"repository": ""}}, + "scons": {"repository": ""}, + "lib svn": {"repository": ""}}, branch=None, builderNames=[name], hour=hour, @@ -222,6 +224,7 @@ def git_submodules_update(): def lib_svn_step(dir): return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, + codebase='lib svn', mode='update', defaultBranch='trunk', workdir='lib/' + dir) |