diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-03 15:49:07 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-03 15:49:07 +0300 |
| commit | d27ef3913a823e571427c8fab23e5ad356cefab3 (patch) | |
| tree | 520b8cc097d16152c06fb0e1fdf467aac6830bf1 | |
| parent | 54a60eff24a73660e1bb1ab488bbc93e528e11e6 (diff) | |
Buildbot: Some special tricks for Blender 2.8 slave
| -rw-r--r-- | build_files/buildbot/master_unpack.py | 3 | ||||
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 3 |
2 files changed, 5 insertions, 1 deletions
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)) |