diff options
Diffstat (limited to 'build_files/buildbot/slave_pack.py')
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 490f0456045..41841d809eb 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -101,17 +101,14 @@ if builder.find('cmake') != -1: platform = builder.split('_')[0] if platform == 'mac': # Special exception for OSX - platform = 'OSX-10.6-' - if builder.endswith('x86_64_10_6_cmake'): + platform = 'OSX-10.9-' + if builder.endswith('x86_64_10_9_cmake'): platform += 'x86_64' - elif builder.endswith('i386_10_6_cmake'): - platform += 'i386' - elif builder.endswith('ppc_10_6_cmake'): - platform += 'ppc' 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 +174,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" |