Use same branch for contrib addons as for official addons
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 23 Oct 2018 07:41:35 +0000 (09:41 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 23 Oct 2018 07:41:35 +0000 (09:41 +0200)
master.cfg

index a6f8819..ba99233 100644 (file)
@@ -119,8 +119,21 @@ def schedule_force_build(name):
                                                           hide=True),
                    ),
                    forcesched.CodebaseParameter(
-                       hide=True,
-                       codebase="blender-addons-contrib"),
+                       codebase="blender-addons-contrib",
+                       branch=forcesched.ChoiceStringParameter(
+                           name="branch",
+                           choices=ADDONS_BRANCHES,
+                           default="master"),
+                       repository=forcesched.FixedParameter(name="repository",
+                                                            default="",
+                                                            hide=True),
+                       project=forcesched.FixedParameter(name="project",
+                                                         default="",
+                                                         hide=True),
+                       revision=forcesched.FixedParameter(name="revision",
+                                                          default="",
+                                                          hide=True),
+                   ),
                    forcesched.CodebaseParameter(
                        hide=True,
                        codebase="blender-dev-tools"),
@@ -166,7 +179,7 @@ def schedule_nightly_build(name, hour, minute=0):
                 "blender-addons": {"repository": "",
                                    "branch": addons_branch},
                 "blender-addons-contrib": {"repository": "",
-                                           "branch": "master"},
+                                           "branch": addons_branch},
                 "blender-dev-tools": {"repository": "",
                                       "branch": "master"},
                 "lib svn": {"repository": "",