Skip to content

Commit

Permalink
Remove buggy force_upload property from anaconda_upload step.
Browse files Browse the repository at this point in the history
This would pass an empty argument to `anaconda upload`
if `force_upload` is not specified, causing it to fail.
whitequark committed Mar 30, 2018
1 parent 3a11491 commit ef23f9f
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -192,8 +192,7 @@ def addCondaUploadSteps(factory, label, force=False):
command = ['anaconda', 'upload',
'--user', 'm-labs', '--label', WithProperties(label),
WithProperties('%(output_filename)s')] +
(['--force'] if force else
[WithProperties('%(force_upload:+--force)s')]),
(['--force'] if force else []),
description = 'uploading',
descriptionDone = 'upload',
descriptionSuffix = 'package',
@@ -527,7 +526,6 @@ addTriggerSteps(artiqBuildFactory,
alwaysUseLatest=False,
waitForFinish=True,
set_properties={"package": "artiq-board",
"force_upload": True,
"artiq_target": test_target,
"artiq_variant": test_variant})
# Test ARTIQ with hardware in the loop

0 comments on commit ef23f9f

Please sign in to comment.