Skip to content

Commit

Permalink
Do not overwrite packages when building via artiq-quick.
Browse files Browse the repository at this point in the history
whitequark committed Jan 19, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent a7ed4b6 commit f29aeec
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -195,7 +195,8 @@ def addCondaUploadSteps(factory, label, force=False):
command = ['anaconda', 'upload',
'--user', 'm-labs', '--label', WithProperties(label),
WithProperties('%(output_filename)s')] +
(['--force'] if force else []),
(['--force'] if force else
[WithProperties('%(force_upload:~--force)s')]),
description = 'uploading',
descriptionDone = 'upload',
descriptionSuffix = 'package',
@@ -578,7 +579,8 @@ addTriggerSteps(artiqBuildFactory,
builder_names=["artiq-board"],
alwaysUseLatest=False,
waitForFinish=True,
set_properties={"package": test_board_package})
set_properties={"package": test_board_package,
"force_upload": True})
# Test ARTIQ with hardware in the loop
addCondaInstallSteps(artiqBuildFactory,
packages=[test_board_package + "=%(output_version)s"])
@@ -599,7 +601,7 @@ addTriggerSteps(artiqBuildFactory,
builder_names=['artiq-win64-test'],
alwaysUseLatest=False,
waitForFinish=True,
set_properties={ 'package': WithProperties('%(output_name)s') })
set_properties={'package': WithProperties('%(output_name)s')})
addFlockReleaseSteps(artiqBuildFactory,
board='kc705-1')
# Build and upload ARTIQ documentation
@@ -632,12 +634,12 @@ artiqQuickBuildFactory = BuildFactory()
addCondaBuildSteps(artiqQuickBuildFactory,
project='artiq', package='artiq-dev')
addCondaUploadSteps(artiqQuickBuildFactory,
force=True, label='%(channel:-quick)s')
label='%(channel:-quick)s')
# Build and upload the `artiq` package
addCondaBuildSteps(artiqQuickBuildFactory,
project='artiq', package='artiq', test=False)
addCondaUploadSteps(artiqQuickBuildFactory,
force=True, label='%(channel:-quick)s')
label='%(channel:-quick)s')
# Build and upload the `artiq-board-*` package
addTriggerSteps(artiqQuickBuildFactory,
builder_names=["artiq-board"],

0 comments on commit f29aeec

Please sign in to comment.