Update for moving blender2.8 to master, master to blender2.7.
This commit is contained in:
12
master.cfg
12
master.cfg
@@ -4,10 +4,10 @@
|
|||||||
# <pep8 compliant>
|
# <pep8 compliant>
|
||||||
|
|
||||||
# List of the branches being built automatically overnight
|
# List of the branches being built automatically overnight
|
||||||
NIGHT_SCHEDULE_BRANCHES = [None, "blender2.8"]
|
NIGHT_SCHEDULE_BRANCHES = [None, "blender2.7"]
|
||||||
|
|
||||||
# List of the branches available for force build
|
# List of the branches available for force build
|
||||||
FORCE_SCHEDULE_BRANCHES = ["master", "blender2.8", "experimental-build"]
|
FORCE_SCHEDULE_BRANCHES = ["master", "blender2.7", "experimental-build"]
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Stock Twisted directory lister doesn't provide any information about last file
|
Stock Twisted directory lister doesn't provide any information about last file
|
||||||
@@ -130,7 +130,7 @@ def schedule_force_build(name):
|
|||||||
forcesched.CodebaseParameter(
|
forcesched.CodebaseParameter(
|
||||||
codebase="blender-addons",
|
codebase="blender-addons",
|
||||||
branch=forcesched.ChoiceStringParameter(
|
branch=forcesched.ChoiceStringParameter(
|
||||||
name="branch", choices=["master", "blender2.8"], default="master"),
|
name="branch", choices=["master", "blender2.7"], default="master"),
|
||||||
repository=forcesched.FixedParameter(name="repository", default="", hide=True),
|
repository=forcesched.FixedParameter(name="repository", default="", hide=True),
|
||||||
project=forcesched.FixedParameter(name="project", default="", hide=True),
|
project=forcesched.FixedParameter(name="project", default="", hide=True),
|
||||||
revision=forcesched.FixedParameter(name="revision", default="", hide=True),
|
revision=forcesched.FixedParameter(name="revision", default="", hide=True),
|
||||||
@@ -146,10 +146,10 @@ def schedule_build(name, hour, minute=0):
|
|||||||
scheduler_name = "nightly " + name
|
scheduler_name = "nightly " + name
|
||||||
if current_branch:
|
if current_branch:
|
||||||
scheduler_name += ' ' + current_branch
|
scheduler_name += ' ' + current_branch
|
||||||
# Use special addons submodule branch when building blender2.8 branch.
|
# Use special addons submodule branch when building blender2.7 branch.
|
||||||
addons_branch = "master"
|
addons_branch = "master"
|
||||||
if current_branch == "blender2.8":
|
if current_branch == "blender2.7":
|
||||||
addons_branch = "blender2.8"
|
addons_branch = "blender2.7"
|
||||||
c['schedulers'].append(timed.Nightly(name=scheduler_name,
|
c['schedulers'].append(timed.Nightly(name=scheduler_name,
|
||||||
codebases={
|
codebases={
|
||||||
"blender": {"repository": ""},
|
"blender": {"repository": ""},
|
||||||
|
@@ -67,8 +67,8 @@ def get_platform(filename):
|
|||||||
|
|
||||||
|
|
||||||
def get_branch(filename):
|
def get_branch(filename):
|
||||||
if filename.startswith("blender-2.8"):
|
if filename.startswith("blender-2.7"):
|
||||||
return "blender2.8"
|
return "blender2.7"
|
||||||
|
|
||||||
tokens = filename.split("-")
|
tokens = filename.split("-")
|
||||||
branch = ""
|
branch = ""
|
||||||
|
Reference in New Issue
Block a user