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

* Add new macos workers

Browse Source 
* Drop 3.6 and most 3.7 builders
* Drop all win32 builders, at least for now
* Add some Py3.10 builders
This commit is contained in:
Robin Dunn
2021-12-17 15:32:21 -08:00
parent 454ef9b2cd
commit d3bdb14365
1 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
buildbot/master.cfg
View File

@@ -43,6 +43,8 @@ import bbpasswd
# worker name and password must be configured on the worker. # worker name and password must be configured on the worker.
c['workers'] = [ c['workers'] = [
worker.Worker('macosx-1', bbpasswd.PASSWD1, max_builds=1), worker.Worker('macosx-1', bbpasswd.PASSWD1, max_builds=1),
worker.Worker('macosx-2', bbpasswd.PASSWD1, max_builds=1),
worker.Worker('macosx-3', bbpasswd.PASSWD1, max_builds=1),
worker.Worker('windows-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('windows-2', bbpasswd.PASSWD1, max_builds=1),
worker.Worker('linux-1', bbpasswd.PASSWD1, max_builds=1), worker.Worker('linux-1', bbpasswd.PASSWD1, max_builds=1),
@@ -191,39 +193,44 @@ def makeTriggerFactory():
# Organize the builder names into these lists to make it easier to specify them # Organize the builder names into these lists to make it easier to specify them
# for the schedulers below, as well as for creating the BuilderConfig objects. # for the schedulers below, as well as for creating the BuilderConfig objects.
regularBuilders = [ 'build-osx-py36', regularBuilders = [ #'build-osx-py36',
'build-osx-py37', #'build-osx-py37',
'build-osx-py38', 'build-osx-py38',
'build-osx-py39', 'build-osx-py39',
'build-gtk2-py36', 'build-osx-py310',
'build-gtk2-py37', #'build-gtk2-py36',
#'build-gtk2-py37',
'build-gtk2-py38', 'build-gtk2-py38',
'build-gtk2-py39', 'build-gtk2-py39',
'build-gtk3-py36', #'build-gtk3-py36',
'build-gtk3-py37', 'build-gtk3-py37',
'build-gtk3-py38', 'build-gtk3-py38',
'build-gtk3-py39', 'build-gtk3-py39',
'build-win32-py36', 'build-gtk3-py310',
'build-win32-py37', #'build-win32-py36',
'build-win32-py38', #'build-win32-py37',
'build-win32-py39', #'build-win32-py38',
'build-win64-py36', #'build-win32-py39',
'build-win64-py37', #'build-win64-py36',
#'build-win64-py37',
'build-win64-py38', 'build-win64-py38',
'build-win64-py39', 'build-win64-py39',
'build-win64-py310',
] ]
distBuilders = [ 'dist-osx-py36', distBuilders = [ #'dist-osx-py36',
'dist-osx-py37', #'dist-osx-py37',
'dist-osx-py38', 'dist-osx-py38',
'dist-osx-py39', 'dist-osx-py39',
'dist-win32-py36', 'dist-osx-py310',
'dist-win32-py37', #'dist-win32-py36',
'dist-win32-py38', #'dist-win32-py37',
'dist-win32-py39', #'dist-win32-py38',
'dist-win64-py36', #'dist-win32-py39',
#'dist-win64-py36',
'dist-win64-py37', 'dist-win64-py37',
'dist-win64-py38', 'dist-win64-py38',
'dist-win64-py39', 'dist-win64-py39',
'dist-win64-py310',
] ]
otherBuilders = [ 'dist-docs-py37', otherBuilders = [ 'dist-docs-py37',
'dist-src-py37', 'dist-src-py37',
@@ -234,7 +241,7 @@ triggerBuilders = [ 'trigger-all-dist',]
def makeBuilderConfigs(builder_names): def makeBuilderConfigs(builder_names):
def _portToWorker(port): def _portToWorker(port):
pwmap = { 'osx': ['macosx-1'], pwmap = { 'osx': ['macosx-1', 'macosx-2', 'macosx-3'],
'gtk2': ['linux-1', 'linux-2'], 'gtk2': ['linux-1', 'linux-2'],
'gtk3': ['linux-1', 'linux-2'], 'gtk3': ['linux-1', 'linux-2'],
'win32': ['windows-1', 'windows-2'], 'win32': ['windows-1', 'windows-2'],
@@ -246,7 +253,7 @@ def makeBuilderConfigs(builder_names):
for bname in builder_names: for bname in builder_names:
btype, port, py = bname.split('-') btype, port, py = bname.split('-')
tags = [btype, port, py] tags = [btype, port, py]
py = '{}.{}'.format(py[2], py[3]) py = '{}.{}'.format(py[2], py[3:])
if port == 'docs': if port == 'docs':
BCs.append(util.BuilderConfig( BCs.append(util.BuilderConfig(
name=bname, tags=tags, name=bname, tags=tags,