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: 0c046b97edb2
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: a7ed4b6b6bd6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 19, 2018

  1. Pass --no-source to conda --output.

    whitequark committed Jan 19, 2018
    Copy the full SHA
    3ac1e5d View commit details

  2. Fix missing WithProperties.

    whitequark committed Jan 19, 2018
    Copy the full SHA
    a7ed4b6 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 master.cfg
4 changes: 2 additions & 2 deletions master.cfg
View file
Original file line number Diff line number Diff line change
@@ -166,7 +166,7 @@ def addCondaBuildSteps(factory, project, package, is_xilinx=False, test=True, ch
factory.addStep(
SetPropertyFromCommand(
name = 'conda_build_output',
command = build_cmd + ['--output'],
command = build_cmd + ['--no-source', '--output'],
extract_fn = extractOutputNames,
description = 'querying',
descriptionSuffix = 'output name',
@@ -193,7 +193,7 @@ def addCondaUploadSteps(factory, label, force=False):
ShellCommand(
name = 'anaconda_upload',
command = ['anaconda', 'upload',
'--user', 'm-labs', '--label', label,
'--user', 'm-labs', '--label', WithProperties(label),
WithProperties('%(output_filename)s')] +
(['--force'] if force else []),
description = 'uploading',