Skip to content
Permalink
Browse files

buildbot: disable msv / remove boost building / cleanup

  • Loading branch information...
abma committed Oct 5, 2019
1 parent fc7554e commit 3687956f53f50fff25a5a5bf35578b3d4afb3b14
Showing with 3 additions and 28 deletions.
  1. +3 −28 buildbot/master/master.cfg
@@ -111,13 +111,13 @@ c['schedulers'].append(basic.AnyBranchScheduler(
treeStableTimer=60,
fileIsImportant=changeIsImportant,
change_filter=ChangeFilter(branch_re='develop|release|post_release'),
builderNames=["full-windows-test", "full-windows-x64", "msvc", "quick-macosx", "validationtests", "linux-static-x64"]))
builderNames=["full-windows-test", "full-windows-x64", "quick-macosx", "validationtests", "linux-static-x64"]))

c['schedulers'].append(basic.AnyBranchScheduler(
name="release-sched",
treeStableTimer=60,
change_filter=ChangeFilter(branch_re='master'),
builderNames=["full-windows-test", "full-windows-x64", "msvc", "full-macosx", "linux-static-x32", "linux-static-x64", "sourcebuilder", "wikibuilder", "doxygen"]))
builderNames=["full-windows-test", "full-windows-x64", "full-macosx", "linux-static-x32", "linux-static-x64", "sourcebuilder", "wikibuilder", "doxygen"]))

c['schedulers'].append(timed.Nightly(
name='nightly',
@@ -490,13 +490,6 @@ class WikiWeaponDefs(ShellCommand) :
descriptionDone = 'updated WeaponDefs wiki'
command = ['./buildbot/slave/wiki/update_weapondefs_page.sh', WithConfig(), WithBranch()]

class BuildMingwBoost(WarningCountingShellCommand) :
name = "build boost"
description = "building boost"
descriptionDone = "build boost"
warnOnWarnings = True
command = ['./buildbot/mingwlibs_boost.sh', WithConfig(), WithBranch()]

# end common build config steps -----------------------------------------@


@@ -563,7 +556,6 @@ class LinuxStaticBuildFactory(BuildFactory):
self.addStep( CreateBuildDirPy() )
self.addStep( BuildConfigNinja() )
self.addStep( TestConfig() )
self.addStep( TestIfStaticLinked(libname="boost") )
self.addStep( TestIfStaticLinked(libname="minizip") )
self.addStep( TestIfStaticLinked(libname="libz.", name="zlib") )
self.addStep( TestIfStaticLinked(libname="SDL") )
@@ -674,13 +666,6 @@ class ValidationBuildFactory(BuildFactory):
self.addStep( TestConfig() )
self.addStep( RsyncStuff() )

class MingwLibsBuildFactory(BuildFactory):
def __init__(self):
BuildFactory.__init__(self)
self.useProgress = False
self.addStep( Git(repourl=mingwlibs_repo) )
self.addStep( BuildMingwBoost() )

class MsvcFullBuildFactory(BuildFactory):
def __init__(self):
BuildFactory.__init__(self)
@@ -882,17 +867,9 @@ validation_builder = {
}
}

mingwlibs_builder = {
'name': 'mingwlibs',
'slavenames': ['buildslave-win32'],
'builddir': 'mingwlibs',
'factory': MingwLibsBuildFactory(),
'properties': {'branch': 'master'}
}

msvc_builder = {
'name': 'msvc',
'slavenames': ['supermario'],
'slavenames': [],
'builddir': 'msvc',
'factory': MsvcFullBuildFactory(),
'properties': {'branch': 'master'},
@@ -918,8 +895,6 @@ c['builders'].append(cppcheck_builder)
c['builders'].append(doxygen_builder)
c['builders'].append(source_builder)
c['builders'].append(wiki_builder)
c['builders'].append(mingwlibs_builder)
c['builders'].append(msvc_builder)


####### STATUS TARGETS

0 comments on commit 3687956

Please sign in to comment.
You can’t perform that action at this time.