diff --git a/master.cfg b/master.cfg index 99fad0e..7c0ff0d 100644 --- a/master.cfg +++ b/master.cfg @@ -4,13 +4,13 @@ # # List of the branches being built automatically overnight -NIGHT_SCHEDULE_BRANCHES = ["master", "blender2.7"] +NIGHT_SCHEDULE_BRANCHES = ["master"] # List of the branches available for force build -FORCE_SCHEDULE_BRANCHES = ["master", "blender2.7", "experimental-build"] +FORCE_SCHEDULE_BRANCHES = ["master", "experimental-build"] # List of branches availble for addons branch selection. -ADDONS_BRANCHES = ["master", "blender2.7"] +ADDONS_BRANCHES = ["master"] # List of branches availble for libraries branch selection. LIB_BRANCHES = ["trunk"] @@ -165,10 +165,7 @@ def schedule_nightly_build(name, hour, minute=0): scheduler_name = "nightly_" + name if current_branch: scheduler_name += ' ' + current_branch - # Use special addons submodule branch when building blender2.7 branch. addons_branch = "master" - if current_branch == "blender2.7": - addons_branch = "blender2.7" c['schedulers'].append(timed.Nightly( name=scheduler_name, codebases={ diff --git a/master_unpack.py b/master_unpack.py index 4cf7b7b..3a25be9 100644 --- a/master_unpack.py +++ b/master_unpack.py @@ -67,9 +67,6 @@ def get_platform(filename): def get_branch(filename): - if filename.startswith("blender-2.7"): - return "blender2.7" - tokens = filename.split("-") branch = ""