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

Merge pull request #1 from wxWidgets/master

Browse Source 
Sync from Master
This commit is contained in:
Steve (Gadget) Barnes
2016-05-26 06:31:38 +01:00
parent c1d26d1e84 f03b1157d9
commit fb78c795b9
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
buildbot/master.cfg
View File

@@ -21,7 +21,7 @@ c = BuildmasterConfig = {}
# is a BuildSlave object, specifying a unique slave name and password. The
# same slave name and password must be configured on the slave.
# Passwords are stored separately and not maintained in the souce repository
# Passwords are stored separately and not maintained in the source repository
# for security's sake
import bbpasswd
reload(bbpasswd)
@@ -98,9 +98,11 @@ c['schedulers'].append( SingleBranchScheduler(
"build-osx-py34",
"build-osx-py35",
"build-gtk-py27",
"build-gtk-py33",
"build-gtk-py34",
"build-gtk-py35",
"build-gtk3-py27",
"build-gtk3-py33",
"build-gtk3-py34",
"build-gtk3-py35",
]))
@@ -139,9 +141,11 @@ c['schedulers'].append( ForceScheduler(
"build-osx-py34",
"build-osx-py35",
"build-gtk-py27",
"build-gtk-py33",
"build-gtk-py34",
"build-gtk-py35",
"build-gtk3-py27",
"build-gtk3-py33",
"build-gtk3-py34",
"build-gtk3-py35",
"dist-osx-py27",
"dist-osx-py34",
"dist-osx-py35",
@@ -293,18 +297,25 @@ c['builders'] = [
slavenames=["ubuntu-x64_86-py27"],
factory=makeFactory('gtk')),
BuilderConfig(name="build-gtk-py33",
BuilderConfig(name="build-gtk-py34",
slavenames=["ubuntu-x64_86-py27"],
factory=makeFactory('gtk', pyVer='3.3')),
factory=makeFactory('gtk', pyVer='3.4')),
BuilderConfig(name="build-gtk-py35",
slavenames=["ubuntu-x64_86-py27"],
factory=makeFactory('gtk', pyVer='3.5')),
BuilderConfig(name="build-gtk3-py27",
slavenames=["ubuntu-x64_86-py27"],
factory=makeFactory('gtk3')),
BuilderConfig(name="build-gtk3-py33",
BuilderConfig(name="build-gtk3-py34",
slavenames=["ubuntu-x64_86-py27"],
factory=makeFactory('gtk3', pyVer='3.3')),
factory=makeFactory('gtk3', pyVer='3.4')),
BuilderConfig(name="build-gtk3-py35",
slavenames=["ubuntu-x64_86-py27"],
factory=makeFactory('gtk3', pyVer='3.5')),
BuilderConfig(name="build-docs",