diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-08-28 11:33:29 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-08-28 11:33:29 +0300 |
commit | 6b5d8c29e6d6fca192002edba2fd2c7234eb1996 (patch) | |
tree | bd95ff9942b53200c52d7c01e549ddd4c21dad87 /build_files/buildbot | |
parent | 7114b5681f5c6827149f34420eb5dc2ca2a1c656 (diff) | |
parent | b11b5b273e8d38e96372b01c5171986591d7d2bd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/buildbot')
-rw-r--r-- | build_files/buildbot/master.cfg | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index c650cb8c302..dad7f1e01d2 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -312,15 +312,13 @@ def generic_builder(id, libdir='', branch='', rsync=False): # Builders -add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=5) -# add_builder(c, 'linux_glibc211_i686_cmake', '', generic_builder, hour=1) -# add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2) -add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=3) -add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=4) -add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=3) -add_builder(c, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=4) -add_builder(c, 'win32_cmake_vc2015', 'windows_vc14', generic_builder, hour=5) -add_builder(c, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=6) +add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=1) +add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=2) +add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=1) +add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=1) +add_builder(c, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=2) +add_builder(c, 'win32_cmake_vc2015', 'windows_vc14', generic_builder, hour=3) +add_builder(c, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=4) # STATUS TARGETS # |