From 9916006fa73b5f1f47a15b10813db540ef1f2724 Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Fri, 15 Apr 2016 20:04:10 -0500 Subject: [PATCH] Initial Windows support --- buildbot/master/files/config/master.cfg | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/buildbot/master/files/config/master.cfg b/buildbot/master/files/config/master.cfg index 55f4b938..c0a1770a 100644 --- a/buildbot/master/files/config/master.cfg +++ b/buildbot/master/files/config/master.cfg @@ -11,6 +11,7 @@ SERVO_REPO = "https://github.com/servo/servo" LINUX_RESERVED_SLAVES = ["servo-linux1", "servo-linux2"] MAC_SLAVES = ["servo-mac1", "servo-mac2", "servo-mac3"] CROSS_SLAVES = ["servo-linux-cross1", "servo-linux-cross2"] +WINDOWS_SLAVES = ["servo-windows1"] c = BuildmasterConfig = {} c['protocols'] = {'pb': {'port': 9001}} @@ -23,7 +24,7 @@ c['caches'] = { ####### BUILDSLAVES c['slaves'] = [] -for s in MAC_SLAVES + CROSS_SLAVES + LINUX_RESERVED_SLAVES: +for s in MAC_SLAVES + CROSS_SLAVES + LINUX_RESERVED_SLAVES + WINDOWS_SLAVES: c['slaves'].append(buildslave.BuildSlave(s, SLAVE_PASSWORD, max_builds=1)) ####### CHANGESOURCES @@ -47,7 +48,7 @@ c['schedulers'] = [] c['schedulers'].append(schedulers.AnyBranchScheduler( name="servo-auto", treeStableTimer=None, - builderNames=["linux-dev", "linux-rel", "mac-rel-wpt", "mac-dev-unit", "mac-rel-css", "android", "gonk", "arm32", "arm64"], + builderNames=["linux-dev", "linux-rel", "mac-rel-wpt", "mac-dev-unit", "mac-rel-css", "android", "gonk", "arm32", "arm64", "windows"], change_filter=util.ChangeFilter(filter_fn=servo_auto_try_filter), )) c['schedulers'].append(schedulers.SingleBranchScheduler( @@ -58,7 +59,7 @@ c['schedulers'].append(schedulers.SingleBranchScheduler( )) c['schedulers'].append(schedulers.ForceScheduler( name="force", - builderNames=["linux-dev", "linux-rel", "mac-rel-wpt", "mac-dev-unit", "mac-rel-css", "android", "gonk", "arm32", "arm64", "android-nightly"] + builderNames=["linux-dev", "linux-rel", "mac-rel-wpt", "mac-dev-unit", "mac-rel-css", "android", "gonk", "arm32", "arm64", "android-nightly", "windows"] )) c['schedulers'].append(schedulers.Nightly( name="Nightly", @@ -231,6 +232,16 @@ arm64_factory = create_servo_factory([ steps.Compile(command=["./mach", "build", "--rel", "--target=aarch64-unknown-linux-gnu"], env=arm64_compile_env), ]) +windows_compile_env = dict({'PATH': r'C:\msys64\mingw64\bin;C:\msys64\usr\bin\C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Amazon\cfn-bootstrap', + 'MSYSTEM': 'MINGW64', + 'MSYS': 'winsymlinks=lnk'}, + **common_test_env) + +windows_factory = create_servo_factory([ + steps.Compile(command=["./mach", "build", "-d", "-v"], env=windows_compile_env), + steps.Compile(command=["./mach", "test-unit"], env=windows_compile_env), +]) + doc_factory = create_servo_factory([ steps.ShellCommand(command=["etc/ci/upload_docs.sh"], env={'TOKEN': GITHUB_DOC_TOKEN, @@ -311,6 +322,13 @@ c['builders'].append(util.BuilderConfig( nextBuild=branch_priority, category="auto", )) +c['builders'].append(util.BuilderConfig( + name="windows", + slavenames=WINDOWS_SLAVES, + factory=windows_factory, + nextBuild=branch_priority, + category="auto", +)) c['builders'].append(util.BuilderConfig( name="doc", slavenames=LINUX_RESERVED_SLAVES,