A little more cleanup in the buildbot files

This commit is contained in:
Robin Dunn
2019-09-17 18:25:24 -07:00
parent 6cf07611d7
commit 8cd7531c06
2 changed files with 11 additions and 4 deletions

View File

@@ -1,5 +1,13 @@
# -*- python -*-
# ex: set filetype=python:
#-------------------------------------------------------------------------------
# This is the buildmaster config file for the wxPython Phoenix Buildbot,
# located at http://buildbot.wxpython.org:8011/. This file is located here in
# order to allow it to be versioned and backed up. However it is NOT
# automatically copied into the buildmaster's working folder, that must be
# done by hand after reviewing changes made here. It must be installed as
# 'master.cfg' in the buildmaster's base directory.
#-------------------------------------------------------------------------------
from buildbot.plugins import *
@@ -26,7 +34,6 @@ GIT_BRANCH = 'master'
# Passwords are stored separately and not maintained in the source repository
# for security's sake
import bbpasswd
#reload(bbpasswd)
##---------------------------------------------------------------------------
####### WORKERS
@@ -116,7 +123,7 @@ def makeBuildFactory(wxport, py_ver, build_type='basic'):
common_opts.append('--x64')
if build_type == 'dist':
common_opts.append('--relwithdebug')
if build_type != 'docs':
if build_type not in ['docs', 'sdist']:
common_opts.append('--nodoc')
common_opts.append(util.Interpolate('%(prop:do-release-build:#?|--release|)s'))
common_opts.append(util.Property('extra-build-arg', default=''))