Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/buildbot-config
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d066b2d56019
Choose a base ref
...
head repository: m-labs/buildbot-config
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5a888862fa63
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 26, 2018

  1. Revert "Fix renderer import."

    This reverts commit d066b2d.
    whitequark committed Mar 26, 2018
    Copy the full SHA
    9a84282 View commit details
  2. Another attempt at fixing env["PATH"] issues.

    whitequark committed Mar 26, 2018
    Copy the full SHA
    5a88886 View commit details
Showing with 13 additions and 16 deletions.
  1. +13 −16 master.cfg
29 changes: 13 additions & 16 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ from buildbot import locks
from buildbot.process.properties import WithProperties
from buildbot.process.factory import BuildFactory
from buildbot.process.buildstep import BuildStep
from buildbot.plugins.util import renderer
from buildbot.process.properties import renderer
from buildbot.status.builder import SUCCESS, FAILURE, SKIPPED
from buildbot.status.github import GitHubStatus
from buildbot.steps.source.git import Git
@@ -95,31 +95,28 @@ conda_env_name = 'buildbot-%(buildername)s-%(buildnumber)s'
def condaEnv(use_local=False, extra_vars={}):
@renderer
def extendPath(props):
if 'windows' in props.getProperty('slavename'):
if use_local:
env_root = '%(builddir)s\\..\\miniconda\\envs\\' + conda_env_name
else:
env_root = '%(builddir)s\\..\\miniconda'
builddir = props.getProperty('builddir')

if use_local:
env_root = [builddir, '..', 'miniconda', 'envs', conda_env_name]
else:
env_root = [builddir, '..', 'miniconda']

return WithProperties(";".join([
if 'windows' in props.getProperty('slavename'):
return ["\\".join(x) for x in [
env_root,
env_root + '\\Scripts',
env_root + '\\Library\\bin',
'${PATH}'
]))
]]
else: # *nix
if use_local:
env_root = '%(builddir)s/../miniconda/envs/' + conda_env_name
else:
env_root = '%(builddir)s/../miniconda'

return WithProperties(":".join([
return ["/".join(x) for x in [
env_root + '/bin',
'${PATH}'
]))
]]

env = {
'PATH': WithProperties("%(path)s", path=extendPath),
'PATH': extendPath,
'BUILDNUMBER': WithProperties('%(buildnumber)s'),
# otherwise, conda's stdout and tests' stderr output interleaves badly.
'PYTHONUNBUFFERED': '1'