[pypy-commit] buildbot default: move build step to outer function

mattip pypy.commits at gmail.com
Wed Nov 13 11:09:41 EST 2019


Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r1103:16b15bf68743
Date: 2019-11-13 09:09 -0700
http://bitbucket.org/pypy/buildbot/changeset/16b15bf68743/

Log:	move build step to outer function

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -319,14 +319,6 @@
                              workdir=workdir,
                              timeout=3600,
                              haltOnFailure=True))
-    if platform == "win32":
-        # Clean out files via DOS to avoid long filename limitations in hg
-        command = 'for /F "usebackq tokens=1,2" %I IN (`hg stat`) DO @IF "?" == "%I" DEL %J'
-        factory.addStep(
-            ShellCmd(description="clean up files",
-                     command=command,
-                     workdir=workdir,
-                     haltOnFailure=True))
     #
     factory.addStep(
         ShellCmd(description="hg purge",
@@ -350,6 +342,15 @@
         update_hg_old_method(platform, factory, repourl, workdir, revision)
         return
 
+    if platform == "win32":
+        # Clean out files via DOS to avoid long filename limitations in hg
+        command = 'for /F "usebackq tokens=1,2" %I IN (`hg stat`) DO @IF "?" == "%I" DEL %J'
+        factory.addStep(
+            ShellCmd(description="clean up files",
+                     command=command,
+                     workdir=workdir,
+                     haltOnFailure=True))
+
     if wipe_bookmarks:
         # We don't use bookmarks at all.  If a bookmark accidentally gets
         # created and pushed to the server and we pull it down, it gets stuck


More information about the pypy-commit mailing list