Support building arbitrary branches

This commit is contained in:
2019-08-30 18:11:29 +02:00
parent ea17163d35
commit 8349e52e4a
2 changed files with 3 additions and 6 deletions

View File

@@ -6,9 +6,6 @@
# List of the branches being built automatically overnight # List of the branches being built automatically overnight
NIGHT_SCHEDULE_BRANCHES = ["master"] NIGHT_SCHEDULE_BRANCHES = ["master"]
# List of the branches available for force build
FORCE_SCHEDULE_BRANCHES = ["master", "experimental-build"]
# Dictionary that the buildmaster pays attention to. # Dictionary that the buildmaster pays attention to.
c = BuildmasterConfig = {} c = BuildmasterConfig = {}
@@ -75,9 +72,8 @@ def schedule_force_build(name):
builderNames=[name], builderNames=[name],
codebases=[forcesched.CodebaseParameter( codebases=[forcesched.CodebaseParameter(
codebase="blender", codebase="blender",
branch=forcesched.ChoiceStringParameter( branch=forcesched.StringParameter(
name="branch", name="branch",
choices=FORCE_SCHEDULE_BRANCHES,
default="master"), default="master"),
# Do not hide revision, can be handy! # Do not hide revision, can be handy!
repository=forcesched.FixedParameter( repository=forcesched.FixedParameter(

View File

@@ -122,7 +122,8 @@ if not branch or branch == 'master':
elif branch == 'experimental-build': elif branch == 'experimental-build':
directory = os.path.join(download_prefix, "experimental") directory = os.path.join(download_prefix, "experimental")
else: else:
directory = download_prefix directory = os.path.join(download_prefix, "branches", branch)
os.makedirs(directory, exist_ok=True)
try: try:
filename = os.path.join(directory, packagename) filename = os.path.join(directory, packagename)