Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 11:30:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing dist builder.

Browse Source 
Use 32-bit Python for win32 builds.
Add additional windows and linux workers.
This commit is contained in:
Robin Dunn
2019-09-18 11:04:46 -07:00
parent 134fe64659
commit dbf38d9d24
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
buildbot/master.cfg
View File

@@ -44,7 +44,9 @@ import bbpasswd
c['workers'] = [
worker.Worker('macosx-1', bbpasswd.PASSWD1, max_builds=1),
worker.Worker('windows-1', bbpasswd.PASSWD1, max_builds=1),
worker.Worker('windows-2', bbpasswd.PASSWD1, max_builds=1),
worker.Worker('linux-1', bbpasswd.PASSWD1, max_builds=1),
worker.Worker('linux-2', bbpasswd.PASSWD1, max_builds=1),
]
@@ -89,10 +91,12 @@ def makeBuildFactory(wxport, py_ver, build_type='basic'):
mode = 'incremental'
method = 'clobber'
if wxport not in ['win32', 'win64']:
PYTHON = f'../../venv-{py_ver}/bin/python'
else:
if wxport == 'win64':
PYTHON = f'..\\..\\venv-{py_ver}\\Scripts\\python.exe'
elif wxport == 'win32':
PYTHON = f'..\\..\\venv-{py_ver}-x32\\Scripts\\python.exe'
else:
PYTHON = f'../../venv-{py_ver}/bin/python'
environ = dict(PYTHONPATH='.', PYTHONUNBUFFERED='1')
# check out the source
@@ -208,6 +212,7 @@ distBuilders = [ 'dist-osx-py27',
'dist-osx-py35',
'dist-osx-py36',
'dist-osx-py37',
'dist-win32-py27',
'dist-win32-py35',
'dist-win32-py36',
'dist-win32-py37',
@@ -226,12 +231,12 @@ triggerBuilders = [ 'trigger-all-dist',]
def makeBuilderConfigs(builder_names):
def _portToWorker(port):
pwmap = { 'osx': ['macosx-1'],
'gtk2': ['linux-1'],
'gtk3': ['linux-1'],
'win32': ['windows-1'],
'win64': ['windows-1'],
'src': ['linux-1'],
'docs': ['windows-1'], }
'gtk2': ['linux-1', 'linux-2'],
'gtk3': ['linux-1', 'linux-2'],
'win32': ['windows-1', 'windows-2'],
'win64': ['windows-1', 'windows-2'],
'src': ['linux-1', 'linux-2'],
'docs': ['windows-1', 'windows-1'], }
return pwmap[port]
BCs = []
for bname in builder_names: