[Bf-blender-cvs] [fb2bc54] master: Buildbot: move lib step before blender.git step
Sergey Sharybin
noreply at git.blender.org
Mon Nov 25 10:25:16 CET 2013
Commit: fb2bc547fe03270b97fa589f2786df6c848dc12e
Author: Sergey Sharybin
Date: Mon Nov 25 15:24:09 2013 +0600
http://developer.blender.org/rBfb2bc547fe03270b97fa589f2786df6c848dc12e
Buildbot: move lib step before blender.git step
This is an attempt to make it so revision from git
SHA is being displayed, not from libs svn revision.
===================================================================
M build_files/buildbot/master.cfg
===================================================================
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index 220fa08..556eef8 100644
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -133,12 +133,13 @@ def generic_builder(id, libdir='', branch='', rsync=False):
unpack_script = 'master_unpack.py'
f = BuildFactory()
+ if libdir != '':
+ f.addStep(lib_svn_step(libdir))
+
for submodule in ('blender-translations', 'blender-addons', 'blender-addons-contrib', 'scons'):
f.addStep(git_submodule_step(submodule))
f.addStep(git_step(branch))
f.addStep(git_submodules_update())
- if libdir != '':
- f.addStep(lib_svn_step(libdir))
f.addStep(Compile(command=['python', compile_script, id], timeout=3600))
f.addStep(Test(command=['python', test_script, id]))
More information about the Bf-blender-cvs
mailing list