[pypy-commit] buildbot default: ignore revision on git update of numpy-compatible builds since they are triggered with a pypy revision id

mattip noreply at buildbot.pypy.org
Tue Mar 3 20:32:53 CET 2015


Author: mattip <matti.picus at gmail.com>
Branch: 
Changeset: r937:6ccf9981ec27
Date: 2015-03-03 21:34 +0200
http://bitbucket.org/pypy/buildbot/changeset/6ccf9981ec27/

Log:	ignore revision on git update of numpy-compatible builds since they
	are triggered with a pypy revision id

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -326,7 +326,8 @@
                 workdir=workdir,
                 logEnviron=False))
 
-def update_git(platform, factory, repourl, workdir, branch='master'):
+def update_git(platform, factory, repourl, workdir, branch='master',
+               alwaysUseLatest=False):
     factory.addStep(
             Git(
                 repourl=repourl,
@@ -334,6 +335,7 @@
                 method='fresh',
                 workdir=workdir,
                 branch=branch,
+                alwaysUseLatest=alwaysUseLatest,
                 logEnviron=False))
 
 def setup_steps(platform, factory, workdir=None,
@@ -986,7 +988,10 @@
 
         # obtain a pypy-compatible branch of numpy
         numpy_url = 'https://www.bitbucket.org/pypy/numpy'
-        update_git(platform, self, numpy_url, 'numpy_src', branch='master')
+        update_git(platform, self, numpy_url, 'numpy_src', branch='master',
+                   alwaysUseLatest=True, # ignore pypy rev number when 
+                                         # triggered by a pypy build
+                   )
 
         self.addStep(ShellCmd(
             description="install numpy",


More information about the pypy-commit mailing list