Buildbot: Some special tricks for Blender 2.8 slave

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 = ""
 

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))