Mercurial > octave-buildbot

changeset 4:5d2e18ee2b92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mxe-octave: don't build tarball from hg for "release" branch
author John W. Eaton <jwe@octave.org>
date Thu, 28 Jun 2018 21:19:34 +0000
parents 7a07ae3068be
children 0b956eea0df3
files master.cfg
diffstat 1 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/master.cfg	Thu Jun 28 18:20:12 2018 +0000
+++ b/master.cfg	Thu Jun 28 21:19:34 2018 +0000
@@ -646,11 +646,7 @@
 
 def mk_mxe_octave_hg_tarball_step (nice = 0, jobs = 8, branch = "default"):
 
-  hg_octave_branch = branch
-  if branch == "release":
-    hg_octave_branch = "stable"
-
-  make_cmd = build_cmd_list (["make", "JOBS=" + str (jobs), "hg-octave-dist", "hg-octave-branch=" + hg_octave_branch],
+  make_cmd = build_cmd_list (["make", "JOBS=" + str (jobs), "hg-octave-dist", "hg-octave-branch=" + branch],
                              nice = nice)
   return Compile (command = make_cmd, workdir = "src", env = build_env,
                   timeout = 14400)
@@ -675,15 +671,19 @@
   factory.addStep (mk_mxe_octave_clean_step (nice = nice))
   factory.addStep (mk_mxe_octave_configure_step (nice = nice, branch = branch,
                                                  opts = configure_opts))
-  ## Create a tarball file from an hg checkout, then build from that.
-  ## This also builds all dependencies for Octave, so it can take a
-  ## while.  Using ccache should help us significantly since we are
-  ## typically rebuilding the same sets of packages repeatedly.
 
-  factory.addStep (mk_mxe_octave_hg_tarball_step (nice = nice, jobs = jobs,
-                                                  branch = branch))
+  if branch != "release":
+    ## Create a tarball file from an hg checkout, then build from that.
+    ## This also builds all dependencies for Octave, so it can take a
+    ## while.  Using ccache should help us significantly since we are
+    ## typically rebuilding the same sets of packages repeatedly.
+
+    factory.addStep (mk_mxe_octave_hg_tarball_step (nice = nice, jobs = jobs,
+                                                    branch = branch))
+
   factory.addStep (mk_mxe_octave_compile_step (nice = nice, jobs = jobs,
                                                opts = compile_opts))
+
   ## factory.addStep (mk_mxe_octave_test_step (nice = nice))
 
   return factory