Mercurial > octave-buildbot

changeset 42:34a08c41b29b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch fixes?
author John W. Eaton <jwe@octave.org>
date Fri, 27 Aug 2021 14:26:16 -0400
parents 9d072aa19d52
children e663de12c34d
files master.cfg
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/master.cfg	Fri Aug 27 12:43:42 2021 -0400
+++ b/master.cfg	Fri Aug 27 14:26:16 2021 -0400
@@ -72,6 +72,7 @@
 c["change_source"] = []
 
 c["change_source"].append (HgPoller (project = "octave",
+                                     branch = "default",
                                      repourl = octave_hg_repo,
                                      workdir = "octave-hg-repo",
                                      pollinterval = 5*60))
@@ -83,6 +84,7 @@
                                      pollinterval = 5*60))
 
 c["change_source"].append (HgPoller (project = "mxe-octave",
+                                     branch = "default",
                                      repourl = mxe_octave_hg_repo,
                                      workdir = "mxe-octave-hg-repo",
                                      pollinterval = 15*60))
@@ -103,7 +105,7 @@
 
 mxe_octave_default_filter = util.ChangeFilter (project = ["mxe-octave", "octave"])
 mxe_octave_release_filter = util.ChangeFilter (project = ["release mxe-octave"])
-mxe_octave_stable_filter = util.ChangeFilter (project = ["release mxe-octave", "stable octcave"])
+mxe_octave_stable_filter = util.ChangeFilter (project = ["release mxe-octave", "stable octave"])
 
 ## SCHEDULERS
 
@@ -745,8 +747,8 @@
                                 compile_opts)
 
 
-def mk_native_factory (nice, jobs, branch, compile_opts):
-  return mk_mxe_octave_factory (nice, jobs, branch, "default",
+def mk_native_factory (nice, jobs, branch, mxe_branch, compile_opts):
+  return mk_mxe_octave_factory (nice, jobs, branch, mxe_branch,
                                 ["--enable-native-build",
                                  "--enable-qt5",
                                  "--enable-lib64-directory",
@@ -759,8 +761,8 @@
                                 compile_opts)
 
 
-def mk_native_all_factory (nice, jobs, branch, compile_opts):
-  return mk_mxe_octave_factory (nice, jobs, branch, "default",
+def mk_native_all_factory (nice, jobs, branch, mxe_branch, compile_opts):
+  return mk_mxe_octave_factory (nice, jobs, branch, mxe_branch,
                                 ["--enable-native-build",
                                  "--enable-qt5",
                                  "--enable-lib64-directory",
@@ -831,11 +833,11 @@
 
 c["builders"].append (BuilderConfig (name = "mxe-native-on-debian",
                                      workernames = ["jwe-debian-x86_64-5"],
-                                     factory = mk_native_factory (19, 8, "default", "tar-dist")))
+                                     factory = mk_native_factory (19, 8, "default", "default", "tar-dist")))
 
 c["builders"].append (BuilderConfig (name = "mxe-native-all-on-debian",
                                      workernames = ["jwe-debian-x86_64-5"],
-                                     factory = mk_native_all_factory (19, 8, "default", "tar-dist")))
+                                     factory = mk_native_all_factory (19, 8, "default", "default", "tar-dist")))
 
 
 ## PROJECT IDENTITY