diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-25 13:24:09 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-25 13:25:10 +0400 |
| commit | fb2bc547fe03270b97fa589f2786df6c848dc12e (patch) | |
| tree | d8e60799a28356a74d0e0d1450fc42c19333ac2e /build_files | |
| parent | 41a90077608898accebd08653d064fe309325a17 (diff) | |
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.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/master.cfg | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 220fa08b23a..556eef88f81 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])) |