Merge branch 'master' into release-prep

This commit is contained in:
Robin Dunn
2017-03-22 21:56:08 -07:00

View File

@@ -93,22 +93,17 @@ c['schedulers'].append( SingleBranchScheduler(
change_filter=ChangeFilter(branch=phoenixGitBranch),
treeStableTimer=30,
builderNames=["build-win32-py27",
"build-win32-py34",
"build-win32-py35",
"build-win32-py36",
"build-win64-py27",
"build-win64-py34",
"build-win64-py35",
"build-win64-py36",
"build-osx-py27",
"build-osx-py34",
"build-osx-py35",
"build-osx-py36",
"build-gtk-py27",
"build-gtk-py34",
"build-gtk-py35",
"build-gtk3-py27",
"build-gtk3-py34",
"build-gtk3-py35",
]))
@@ -119,15 +114,12 @@ c['schedulers'].append( Nightly(
hour=1, minute=15,
onlyIfChanged=True,
builderNames=["dist-osx-py27",
"dist-osx-py34",
"dist-osx-py35",
"dist-osx-py36",
"dist-win32-py27",
"dist-win32-py34",
"dist-win32-py35",
"dist-win32-py36",
"dist-win64-py27",
"dist-win64-py34",
"dist-win64-py35",
"dist-win64-py36",
]))
@@ -157,33 +149,25 @@ c['schedulers'].append( Nightly(
c['schedulers'].append( ForceScheduler(
name='sched-force',
builderNames=["build-win32-py27",
"build-win32-py34",
"build-win32-py35",
"build-win32-py36",
"build-win64-py27",
"build-win64-py34",
"build-win64-py35",
"build-win64-py36",
"build-osx-py27",
"build-osx-py34",
"build-osx-py35",
"build-osx-py36",
"build-gtk-py27",
"build-gtk-py34",
"build-gtk-py35",
"build-gtk3-py27",
"build-gtk3-py34",
"build-gtk3-py35",
"dist-osx-py27",
"dist-osx-py34",
"dist-osx-py35",
"dist-osx-py36",
"dist-win32-py27",
"dist-win32-py34",
"dist-win32-py35",
"dist-win32-py36",
"dist-win64-py27",
"dist-win64-py34",
"dist-win64-py35",
"dist-win64-py36",
"bdist-docs",