diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg index 7bc941ad..6fd2c07c 100644 --- a/buildbot/master/master.cfg +++ b/buildbot/master/master.cfg @@ -12,12 +12,6 @@ LINUX_RESERVED_SLAVES = ["servo-linux1", "servo-linux2"] MAC_SLAVES = ["servo-mac1", "servo-mac2", "servo-mac3"] CROSS_SLAVES = ["servo-linux-cross1", "servo-linux-cross2"] -# These will lock a project to a single platform -MAC_ONLY_PROJECTS = ['servo/io-surface-rs'] -LINUX_ONLY_PROJECTS = [] -# By default, cargo projects are not build on android. Put them here to add android -ANDROID_PROJECTS = ['mozjs', 'rust-mozjs'] - c = BuildmasterConfig = {} c['protocols'] = {'pb': {'port': 9001}} c['caches'] = { @@ -49,24 +43,6 @@ def servo_master_filter(c): return True return False -def cargo_linux_filter(c): - if c.project != 'servo/servo' and c.who.startswith('bors-servo') \ - and c.branch == 'auto' and c.project not in MAC_ONLY_PROJECTS: - return True - return False - -def cargo_mac_filter(c): - if c.project != 'servo/servo' and c.who.startswith('bors-servo') \ - and c.branch == 'auto' and c.project not in LINUX_ONLY_PROJECTS: - return True - return False - -def cargo_android_filter(c): - if c.project != 'servo/servo' and c.who.startswith('bors-servo') \ - and c.branch == 'auto' and c.project in ANDROID_PROJECTS: - return True - return False - c['schedulers'] = [] c['schedulers'].append(schedulers.AnyBranchScheduler( name="servo-auto", @@ -91,25 +67,6 @@ c['schedulers'].append(schedulers.Nightly( hour=1, minute=0 )) -c['schedulers'].append(schedulers.SingleBranchScheduler( - name="cargo-linux-auto", - treeStableTimer=None, - builderNames=["cargo-linux"], - change_filter=util.ChangeFilter(filter_fn=cargo_linux_filter) -)) -c['schedulers'].append(schedulers.SingleBranchScheduler( - name="cargo-mac-auto", - treeStableTimer=None, - builderNames=["cargo-mac"], - change_filter=util.ChangeFilter(filter_fn=cargo_mac_filter) -)) -# TODO: -# c['schedulers'].append(schedulers.SingleBranchScheduler( -# name="cargo_android_auto", -# treeStableTimer=None, -# builderNames=["cargo-android"], -# change_filter=util.ChangeFilter(filter_fn=cargo_android_filter) -# )] ####### BUILDERS @@ -281,39 +238,6 @@ doc_factory = create_servo_factory([ logEnviron=False), ]) -# Cargo builds -# NOTE: We use this instead of Travis CI for some projects, either for platform reasons or because -# Travis CI can't handle them. -def create_cargo_factory(env, cargo_env): - cargo_env = dict(env, **cargo_env) - - return create_factory([ - steps.Git(repourl=util.Property('repository'), mode="full", method="clobber"), - steps.ShellCommand(name="download rustup", - command=["curl", "-sL", "https://static.rust-lang.org/rustup.sh", - "-o", "/tmp/rustup.sh"]), - steps.ShellCommand(name="install rust", - command=["sh", "/tmp/rustup.sh", "--prefix=~/.rust", "--channel=nightly", - "-y", "--disable-sudo", "--save"], - env=env, want_stderr=False), - steps.Compile(name="cargo build", description="cargo building", descriptionDone="cargo build", - command=["cargo", "build", "--verbose"], env=cargo_env), - steps.ShellCommand(name="cargo test", description="cargo testing", - descriptionDone="cargo test", command=["cargo", "test", "--verbose"], - env=cargo_env), - steps.RemoveDirectory(name="cleanup", dir="~/buildbot/rust"), - ]) - - -cargo_linux_factory = create_cargo_factory({'SHELL': '/bin/bash'}, { - 'PATH': ['${HOME}/.rust/bin', '${PATH}'], - 'LD_LIBRARY_PATH': '${HOME}/.rust/lib', -}) -cargo_mac_factory = create_cargo_factory({'SHELL': '/bin/bash'}, { - 'PATH': ['${HOME}/.rust/bin', '${PATH}'], - 'DYLD_LIBRARY_PATH': '${HOME}/.rust/lib', -}) - def branch_priority(builder, requests): for r in requests: if r.source.branch != "try": @@ -397,20 +321,6 @@ c['builders'].append(util.BuilderConfig( nextBuild=branch_priority, category="auto", )) -c['builders'].append(util.BuilderConfig( - name="cargo-linux", - slavenames=LINUX_RESERVED_SLAVES, - factory=cargo_linux_factory, - nextBuild=branch_priority, - category="cargo_auto" -)) -c['builders'].append(util.BuilderConfig( - name="cargo-mac", - slavenames=MAC_SLAVES, - factory=cargo_mac_factory, - nextBuild=branch_priority, - category="cargo_auto" -)) ####### STATUS TARGETS