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

Commits on Jan 27, 2017

  1. Remove misoc→artiq build trigger.

    whitequark committed Jan 27, 2017
    Copy the full SHA
    69f8315 View commit details
  2. Copy the full SHA
    7db73d8 View commit details
Showing with 9 additions and 12 deletions.
  1. +9 −12 master.cfg
21 changes: 9 additions & 12 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -544,9 +544,6 @@ addCondaBuildSteps(misocBuildFactory,
project='misoc', package='misoc')
addCondaUploadSteps(misocBuildFactory,
force=True, channels='dev')
addTriggerSteps(misocBuildFactory,
builder_names=['artiq'],
alwaysUseLatest=True)

c['builders'].append(
BuilderConfig(
@@ -575,6 +572,15 @@ addPythonCoverageSteps(artiqBuildFactory,
addLitSteps(artiqBuildFactory,
test_path='artiq/test/lit',
extra_vars={ 'COVERAGE': '1', 'PYTHONPATH': '.' })
addSphinxDocumentSteps(artiqBuildFactory,
source_path='doc/manual',
target_path='artiq/manual')
addSFTPUploadSteps(artiqBuildFactory,
source_path='artiq/manual',
target_host='m-labs.hk',
username=secrets['sftp']['username'],
password=secrets['sftp']['password'],
target_path=WithProperties('artiq/manual-%(branch:~master)s'))
addTriggerSteps(artiqBuildFactory,
builder_names=["artiq-board"],
alwaysUseLatest=False,
@@ -602,15 +608,6 @@ addTriggerSteps(artiqBuildFactory,
alwaysUseLatest=False,
waitForFinish=True,
set_properties={ 'package': packageNameFromOutputName })
addSphinxDocumentSteps(artiqBuildFactory,
source_path='doc/manual',
target_path='artiq/manual')
addSFTPUploadSteps(artiqBuildFactory,
source_path='artiq/manual',
target_host='m-labs.hk',
username=secrets['sftp']['username'],
password=secrets['sftp']['password'],
target_path=WithProperties('artiq/manual-%(branch:~master)s'))
addCondaTeardownTestEnvironmentSteps(artiqBuildFactory)

c['builders'].append(