Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-01-29 15:47:47 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-01-29 15:47:47 +0300
commitd3989a314084736a5715b77ce1c2d7f8f5f2a537 (patch)
treed9325652d6933125628805e79ed6d34dcddeb945 /build_files/buildbot
parent15abb48a043f93e53ce90288c6a57730a0f9fef1 (diff)
Buildbot: Update master configuration
Diffstat (limited to 'build_files/buildbot')
-rw-r--r--build_files/buildbot/master.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index 26b5716a185..c05472332aa 100644
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -293,11 +293,11 @@ 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, 'mac_i386_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=11)
add_builder(c, 'linux_glibc211_i386_cmake', '', generic_builder, hour=1)
add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2)
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, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=5)
# STATUS TARGETS
#