diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-01 16:31:25 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-01 16:31:48 +0400 |
| commit | 682b949d0fb0bc4f1bc70a400702893481a79537 (patch) | |
| tree | 88efe7c0bd4b4d58bd7817741a4d68fa3c4358a4 /build_files | |
| parent | edfd989e864f2c87d2bbceef1acf88bbb46db497 (diff) | |
Sync changes with buildbot server
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/master.cfg | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 08c96f687b4..6b3efb469b3 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -147,9 +147,9 @@ def generic_builder(id, libdir='', branch='', rsync=False): if rsync: f.addStep(rsync_step(id, branch, rsync_script)) elif id.find('cmake') != -1: - f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024)) + f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=150 * 1024 * 1024)) else: - f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024, workdir='install')) + f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=150 * 1024 * 1024, workdir='install')) f.addStep(MasterShellCommand(name='unpack', command=['python', unpack_script, filename], description='unpacking', descriptionDone='unpacked')) return f @@ -161,6 +161,10 @@ add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder, hour=1) add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder, hour=2) add_builder(c, 'win32_scons', 'windows', generic_builder, hour=1) add_builder(c, 'win64_scons', 'win64', generic_builder, hour=2) +#add_builder(c, 'win32_scons_vc2012', 'windows_vc11', generic_builder, hour=1) +#add_builder(c, 'win64_scons_vc2012', 'win64_vc11', generic_builder, hour=2) +add_builder(c, 'win32_scons_vc2013', 'windows_vc12', generic_builder, hour=1) +add_builder(c, 'win64_scons_vc2013', 'win64_vc12', generic_builder, hour=2) #add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder, hour=4) add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder, hour=3) #add_builder(c, 'freebsd_i386_cmake', '', generic_builder, hour=1) |