[Bf-blender-cvs] [15b5f84] master: Buildbot: fix to previous commit, to handle svn libs...
Bastien Montagne
noreply at git.blender.org
Wed Jul 23 21:04:46 CEST 2014
Commit: 15b5f84a1e032b4979313151a67b00cd976b9316
Author: Bastien Montagne
Date: Wed Jul 23 19:34:30 2014 +0200
Branches: master
https://developer.blender.org/rB15b5f84a1e032b4979313151a67b00cd976b9316
Buildbot: fix to previous commit, to handle svn libs...
===================================================================
M build_files/buildbot/master.cfg
===================================================================
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index 2e6663e..d5bc8b9 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)
More information about the Bf-blender-cvs
mailing list