diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-03 16:15:56 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-03 16:15:56 +0300 |
| commit | 5884c9f1ba45b8285930508b8ee04279a7b0b387 (patch) | |
| tree | 11a71aea12aa2e4bf6121f21c041d0da7296928d /build_files | |
| parent | 3b6eaf8d96bce59756f669e0c5105ae3bb31bef8 (diff) | |
| parent | cc93a66e71a9de09cb41d4433be86e0f056d2b6f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/master_unpack.py | 3 | ||||
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 6 |
2 files changed, 7 insertions, 2 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..6929be85003 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)) @@ -177,7 +178,8 @@ if builder.find('cmake') != -1: blender_hash, blender_glibc, blender_arch) - if branch != '': + # NOTE: Blender 2.8 is already respected by blender_full_version. + if branch != '' and branch != 'blender2.8': package_name = branch + "-" + package_name upload_filename = package_name + ".tar.bz2" |