master/master.cfg: Build all changes to both stable and master

D-Programming-GDC · Jun 18, 2018 · b0a11ba · b0a11ba
1 parent 4c37020
commit b0a11ba
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/master/master.cfg b/master/master.cfg
@@ -60,6 +60,10 @@ worker_map = {
 builders = sorted(builder_map.iterkeys())
 workers = sorted(worker_map.iterkeys())
 
+branches = [
+        'master',
+        'stable',
+]
 
 ####### WORKERS
 
@@ -72,16 +76,16 @@ c['protocols'] = {'pb': {'port': os.environ["BUILDMASTER_PORT"]}}
 
 c['change_source'] = []
 c['change_source'].append(changes.GitPoller(repourl='git://github.com/D-Programming-GDC/GDC.git',
-                                            branch='master',
+                                            branches=branches,
                                             pollinterval=300,
                                             workdir='gitpoller-workdir'))
 
 ####### SCHEDULERS
 
 c['schedulers'] = []
-c['schedulers'].append(schedulers.SingleBranchScheduler(name="all", branch='master',
-                                                        treeStableTimer=60,
-                                                        builderNames=builders))
+c['schedulers'].append(schedulers.AnyBranchScheduler(name="all", branches=branches,
+                                                     treeStableTimer=60,
+                                                     builderNames=builders))
 c['schedulers'].append(schedulers.ForceScheduler(name="force",
                                                  builderNames=builders))