[Bf-blender-cvs] [d27ef3913a8] master: Buildbot: Some special tricks for Blender 2.8 slave

Sergey Sharybin noreply at git.blender.org
Mon Apr 3 14:49:26 CEST 2017


Commit: d27ef3913a823e571427c8fab23e5ad356cefab3
Author: Sergey Sharybin
Date:   Mon Apr 3 14:49:07 2017 +0200
Branches: master
https://developer.blender.org/rBd27ef3913a823e571427c8fab23e5ad356cefab3

Buildbot: Some special tricks for Blender 2.8 slave

===================================================================

M	build_files/buildbot/master_unpack.py
M	build_files/buildbot/slave_pack.py

===================================================================

diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py
index ec44705931c..67b628f668a 100644
--- a/build_files/buildbot/master_unpack.py
+++ b/build_files/buildbot/master_unpack.py
@@ -67,6 +67,9 @@ def get_platform(filename):
 
 
 def get_branch(filename):
+    if filename.startswith("blender-2.8"):
+        return "blender2.8"
+
     tokens = filename.split("-")
     branch = ""
 
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 490f0456045..33bf3745182 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -111,7 +111,8 @@ if builder.find('cmake') != -1:
         if builder.endswith('vc2015'):
             platform += "-vc14"
         builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform)
-        if branch != '':
+        # NOTE: Blender 2.8 is already respected by blender_full_version.
+        if branch != '' and branch != 'blender2.8':
             builderified_name = branch + "-" + builderified_name
 
         os.rename(result_file, "{}.zip".format(builderified_name))




More information about the Bf-blender-cvs mailing list