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

Remove the vagrant builder for now,

Browse Source 
there are some issues that need to be dealt with but it may be easier
to just do them by hand for now.
This commit is contained in:
Robin Dunn
2016-12-15 14:16:43 -08:00
parent f803d20132
commit bc5ccab926
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
buildbot/master.cfg
View File

@@ -47,9 +47,9 @@ c['slaves'] = [#BuildSlave("osx-10.7-vm-py2.7", bbpasswd.PASSWD1,
# notify_on_missing='robin@alldunn.com',
# max_builds=1),
BuildSlave('vagrant-bldr', bbpasswd.PASSWD1,
notify_on_missing='robin@alldunn.com',
max_builds=1),
#BuildSlave('vagrant-bldr', bbpasswd.PASSWD1,
# notify_on_missing='robin@alldunn.com',
# max_builds=1),
]
# 'slavePortnum' defines the TCP port to listen on for connections from slaves.
@@ -141,12 +141,12 @@ c['schedulers'].append( Nightly(
onlyIfChanged=True,
builderNames=["bdist-src"]))
c['schedulers'].append( Nightly(
name="sched-vagrant",
branch=phoenixGitBranch,
hour=1, minute=10,
onlyIfChanged=True,
builderNames=["vagrant-bldr"]))
# c['schedulers'].append( Nightly(
# name="sched-vagrant",
# branch=phoenixGitBranch,
# hour=1, minute=10,
# onlyIfChanged=True,
# builderNames=["vagrant-bldr"]))
c['schedulers'].append( ForceScheduler(
name='sched-force',
@@ -176,7 +176,7 @@ c['schedulers'].append( ForceScheduler(
"dist-win64-py35",
"bdist-docs",
"bdist-src",
"vagrant-bldr",
#"vagrant-bldr",
]))
@@ -250,7 +250,11 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
'sphinx bdist_docs --upload' % pyVer
elif buildType == 'vagrant':
cmd = 'python -u build.py setrev dox etg --nodoc sip sdist build_vagrant --upload'
# TODO: This will also upload the source tarfile, which is redundant
# since there is another job for that. Is there an easy way around
# that?
cmd = 'python -u build.py setrev dox etg --nodoc sip sdist ' \
'build_vagrant --upload'
else:
cmd = 'python -u build.py %s %s setrev dox touch etg --nodoc sip build' % (pyVer, clean)
@@ -394,9 +398,9 @@ c['builders'] = [
factory=makeFactory('win64', 'dist', pyVer='3.5')),
BuilderConfig(name="vagrant-bldr",
slavenames=["vagrant-bldr"],
factory=makeFactory('osx', 'vagrant')),
# BuilderConfig(name="vagrant-bldr",
# slavenames=["vagrant-bldr"],
# factory=makeFactory('osx', 'vagrant')),
]