Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Buildbot: don't add branch prefix when building release branches

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-10-11 13:45:16 +02:00
parent 74f9b9d144
commit b57a89f062
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/buildbot/slave_pack.py
View File

@@ -32,8 +32,9 @@ def get_package_name(builder, platform=None):
package_name = 'blender-' + info.full_version
if platform:
package_name += '-' + platform
if builder.branch != 'master' and info.is_development_build:
package_name = builder.branch + "-" + package_name
if not (builder.branch == 'master' or builder.is_release_branch):
if info.is_development_build:
package_name = builder.branch + "-" + package_name
return package_name
@@ -47,6 +48,7 @@ def create_buildbot_upload_zip(builder, package_files):
try:
z = zipfile.ZipFile(buildbot_upload_zip, "w", compression=zipfile.ZIP_STORED)
for filepath, filename in package_files:
print("Packaged", filename)
z.write(filepath, arcname=filename)
z.close()
except Exception as ex: