Merge pull request #139 from alexcrichton/no-cargo

Delete all Cargo configuration

Author: alexcrichton

master/master.cfg

@@ -96,10 +96,8 @@ for line in open("master.cfg.txt"):
 env = master_config['env']
 master_addy = master_config['master_addy']
 git_source = master_config['git_source']
-cargo_source = master_config['cargo_source']
 packaging_source = master_config['packaging_source']
 s3_addy = master_config['s3_addy']
-s3_cargo_addy = master_config['s3_cargo_addy']
 dist_server_addy = master_config['dist_server_addy']
 public_dist_server_addy = master_config['public_dist_server_addy']
 
@@ -183,13 +181,6 @@ dist_platforms = ["linux", "mac", "arm-android", "musl-linux",
 packaging_platforms = ["linux", "mac",
                        "win-gnu-32", "win-gnu-64",
                        "win-msvc-32", "win-msvc-64"]
-cargo_platforms = ["linux-32", "linux-64", "mac-32", "mac-64",
-                   "cross-linux",
-                   "win-gnu-32", "win-gnu-64",
-                   "win-msvc-32", "win-msvc-64",
-                   #"bitrig-64"
-                   ]
-cargo_dist_platforms = [p for p in cargo_platforms if "linux" in p or "mac" in p or "win" in p]
 
 def works_in_dev(platform):
     return 'linux' in platform or \
@@ -200,7 +191,6 @@ if env != "prod":
     try_platforms = [p for p in try_platforms if works_in_dev(p)]
     snap_platforms = [p for p in snap_platforms if works_in_dev(p)]
     dist_platforms = [p for p in dist_platforms if works_in_dev(p)]
-    cargo_platforms = [p for p in cargo_platforms if works_in_dev(p)]
     packaging_platforms = [p for p in packaging_platforms if works_in_dev(p)]
 
 
@@ -220,24 +210,6 @@ dist_nogate_platforms = [
     #"cross-rustbuild-linux",
 ]
 
-cargo_cross_targets = [
-  'arm-unknown-linux-gnueabi',
-  'arm-unknown-linux-gnueabihf',
-  'armv7-unknown-linux-gnueabihf',
-  'aarch64-unknown-linux-gnu',
-  'x86_64-unknown-freebsd',
-  'x86_64-unknown-netbsd',
-  'i686-unknown-freebsd',
-  'mips-unknown-linux-gnu',
-  'mipsel-unknown-linux-gnu',
-  'mips64-unknown-linux-gnuabi64',
-  'mips64el-unknown-linux-gnuabi64',
-  's390x-unknown-linux-gnu',
-  'powerpc-unknown-linux-gnu',
-  'powerpc64-unknown-linux-gnu',
-  'powerpc64le-unknown-linux-gnu',
-]
-
 ios = {'auto': 'cross-ios-opt', 'dist': 'mac-ios'}
 lincross = {'auto': 'linux-cross', 'dist': 'cross-linux'}
 lincross32 = {'auto': 'linux-32cross', 'dist': 'cross32-linux'}
@@ -461,10 +433,6 @@ from buildbot.changes.gitpoller import GitPoller
 main_sources = [GitPoller(git_source,
                           workdir='gitpoller-workdir',
                           branches=all_branches,
-                          pollinterval=60),
-                GitPoller(cargo_source,
-                          workdir='gitpoller-workdir',
-                          branches=["master", "auto-cargo"],
                           pollinterval=60)]
 
 c['change_source'] = main_sources
@@ -533,30 +501,6 @@ stable_dist_packaging_sched = Triggerable(
     name="stable-dist-packaging-sched",
     builderNames=["stable-dist-packaging-" + p for p in packaging_platforms])
 
-nightly_dist_cargo_trigger_sched = Nightly(
-    name="nightly-dist-cargo-trigger-sched",
-    branch="master",
-    builderNames=["nightly-dist-cargo-trigger"],
-    hour=2,
-    minute=0
-    )
-
-nightly_dist_cargo_builders = []
-for p in cargo_dist_platforms:
-    nightly_dist_cargo_builders.append("nightly-dist-cargo-" + p)
-
-nightly_dist_cargo_sched = Triggerable(
-    name="nightly-dist-cargo-sched",
-    builderNames=nightly_dist_cargo_builders,
-    )
-
-cargo_sched = SingleBranchScheduler(
-    name="cargo-sched",
-    change_filter=filter.ChangeFilter(#filter_fn=(lambda c: "bors" in c.who),
-                                      branch='auto-cargo'),
-    treeStableTimer=60,
-    builderNames=["cargo-" + p for p in cargo_platforms])
-
 force_sched = ForceScheduler(
     name="force-sched",
     builderNames=
@@ -586,10 +530,7 @@ master_force_sched = ForceScheduler(
     + ["nightly-dist-rustc-trigger"]
     + ["nightly-dist-packaging-" + p for p in packaging_platforms]
     + ["beta-dist-packaging-" + p for p in packaging_platforms]
-    + ["stable-dist-packaging-" + p for p in packaging_platforms]
-    + nightly_dist_cargo_builders
-    + ["cargo-" + p for p in cargo_platforms]
-    + ["nightly-dist-cargo-trigger"],
+    + ["stable-dist-packaging-" + p for p in packaging_platforms],
 
     reason=StringParameter(name="reason", label="reason:", default="force build",
                            required=False, size=10),
@@ -655,8 +596,6 @@ beta_dist_rustc_sched,
 beta_dist_packaging_sched,
 stable_dist_rustc_sched,
 stable_dist_packaging_sched,
-cargo_sched,
-nightly_dist_cargo_sched,
 force_sched,
 master_force_sched,
 beta_force_sched,
@@ -665,7 +604,6 @@ stable_force_sched
 
 if env == 'prod':
     c['schedulers'].append(nightly_dist_rustc_trigger_sched)
-    c['schedulers'].append(nightly_dist_cargo_trigger_sched)
 
 ####### BUILDERS
 
@@ -859,9 +797,6 @@ class CommandEnv(object):
             env["LD_LIBRARY_PATH"] = ld_path
 
         env["CARGO_HOME"] = "${PWD}/slave/" + props["buildername"] + "/cargo-home"
-        if "cargo" in props:
-            env["PLATFORM"] = props["platform"]
-            env["BITS"] = props["bits"]
 
         return env
 
@@ -876,10 +811,7 @@ class ConfigCommand(object):
               "debug", "debug-assertions", "pax-flags", "clang",
               "inject-std-version", "llvm-static-stdcpp",
               "rustbuild", "nightly"]
-        if "cargo" in props:
-            s = "./configure --local-rust-root=$PWD/rustc"
-        else:
-            s = "../configure"
+        s = "../configure"
 
         for opt in opts:
             if opt in props:
@@ -1139,112 +1071,6 @@ def make_and_check_buildfactory(check, android, windows, parallel, make_args=[])
 
     return f
 
-def cargo_basic_buildfactory():
-    global cargo_source
-    f = BuildFactory()
-    # We wipe if the user requests it or if we can't find a config.stamp
-    # that's been touched in the past 2 days -- suggests config is failing
-    f.addStep(RemoveDirectory("build",
-                              doStepIf=should_wipe))
-    f.addStep(Git(repourl=cargo_source,
-                  progress=True,
-                  #clobberOnFailure=True,
-                  retry=(5, 2), # Combat the flakiness. 2 retries, 5 seconds
-                  retryFetch=True, # Combat the flakiness
-                  mode='full',     # do what `method` says below
-                  method='clean',  # run `git clean -d -f -f`
-                  submodules=True))
-
-    return f
-
-def cargo_buildfactory(p):
-
-    f = cargo_basic_buildfactory()
-
-    f.addStep(ShellCommand(env=CommandEnv(),
-                           command=["sh", ".travis.install.deps.sh"],
-                           workdir=WORKDIR))
-
-    f.addStep(Configure(env=CommandEnv(),
-                        haltOnFailure=True,
-                        flunkOnFailure=True,
-                        command=ConfigCommand(),
-                        interruptSignal="TERM",
-                        workdir=WORKDIR))
-
-    f.addStep(Compile(env=CommandEnv(),
-                      name="clean",
-                      description="make clean-all",
-                      descriptionDone="cleaned",
-                      workdir=WORKDIR,
-                      command=[MakeCommand(), "clean-all"]))
-
-    f.addStep(Compile(env=CommandEnv(),
-                      haltOnFailure=True,
-                      flunkOnFailure=True,
-                      interruptSignal="TERM",
-                      command=[MakeCommand()],
-                      workdir=WORKDIR))
-
-    f.addStep(Test(env=CommandEnv(),
-                   doStepIf="cross" not in p,
-                   haltOnFailure=True,
-                   flunkOnFailure=True,
-                   interruptSignal="TERM",
-                   command=TestCommand(),
-                   timeout=test_timeout,
-                   workdir=WORKDIR))
-
-    return f
-
-def cargo_nightly_buildfactory(platform, hosts):
-    global s3_cargo_addy
-    f = cargo_buildfactory(platform)
-
-    cmd = "distcheck"
-    if "cross" in platform:
-        cmd = "dist"
-    f.addStep(Compile(env=CommandEnv(),
-                      name=cmd,
-                      description="make " + cmd,
-                      descriptionDone="installed",
-                      workdir=WORKDIR,
-                      command=[MakeCommand(), cmd]))
-
-    local_dist_dir = "tmp/dist/cargo-nightly"
-
-    for host in hosts:
-        local_dist_platform_dir = local_dist_dir + "/" + host
-
-        # Delete local dist dir
-        rm_dist_cmd = "rm -rf " + local_dist_platform_dir
-        f.addStep(MasterShellCommand(name="rm dist dir",
-                                     command=["sh", "-c", rm_dist_cmd]))
-
-        tarball = "cargo-nightly-" + host + ".tar.gz"
-        f.addStep(FileUpload(slavesrc="target/" + host + "/release/dist/" + tarball,
-                             masterdest=local_dist_platform_dir + "/" + tarball,
-                             workdir=WORKDIR))
-
-        commit_id_cmd = "echo '%(got_revision)s' > " + local_dist_platform_dir + "/commit-id"
-        f.addStep(MasterShellCommand(name="stamp commit id",
-                                     command=["sh", "-c", WithProperties(commit_id_cmd)]))
-
-    all_cargo_hosts = cargo_cross_targets[:]
-    for p in cargo_dist_platforms:
-        for h in all_platform_hosts(p):
-            all_cargo_hosts += [h]
-    all_cargo_hosts = list(set(all_cargo_hosts))
-
-    f.addStep(DistSync(name="checking for synced cargo dist builds",
-                       stagingDir=local_dist_dir,
-                       platforms=all_cargo_hosts,
-                       nogate_platforms=[],
-                       haltOnFailure=True,
-                       flunkOnFailure=False))
-
-    return finish_dist(f, local_dist_dir, all_cargo_hosts, s3_cargo_addy, "cargo-dist", "cargo", "nightly", True)
-
 def snap3_buildfactory(platform):
     global s3_addy
     f = make_and_check_buildfactory(True, False, "win" in platform, False)
@@ -1292,15 +1118,6 @@ def rust_distsnap_trigger_buildfactory(scheduler_names):
 
     return f
 
-def cargo_distsnap_trigger_buildfactory(scheduler_names):
-    # Need to do check out the source to get the revision (I think)
-    f = cargo_basic_buildfactory()
-
-    f.addStep(Trigger(schedulerNames=scheduler_names))
-
-    return f
-
-
 def distsnap_buildfactory(platform, channel_label):
     global s3_addy
     command = [MakeCommand()]
@@ -1972,71 +1789,6 @@ c['builders'].append(BuilderConfig(
     slavenames=[s.slavename for s in auto_slaves], # any slave; we just need to check out the source to get the current rev
     factory=rust_distsnap_trigger_buildfactory(["stable-dist-rustc-sched"])))
 
-# The cargo nightly trigger
-c['builders'].append(BuilderConfig(
-    mergeRequests=True,
-    name="nightly-dist-cargo-trigger",
-    category="util-dist",
-    nextSlave=nextSlave,
-    slavenames=[s.slavename for s in auto_slaves], # any slave; we just need to check out the source to get the current rev
-    factory=cargo_distsnap_trigger_buildfactory(["nightly-dist-cargo-sched"])))
-
-for platform in cargo_platforms:
-    p = platform.split("-")[0]
-    bits = "32" if "32" in platform else "64"
-    triple = auto_platform_triple(platform)
-    slave_match = p
-    targets = [triple]
-    nightly = None
-    if "cross" in platform:
-        nightly = True
-        targets = cargo_cross_targets[:]
-        slave_match = 'lincross'
-    slaves = [slave.slavename
-              for slave in c['slaves']
-              if slave_match in slave.slavename and slave in auto_slaves]
-    # Builder that does incremental-make-check-lite runs,
-    # host=target only, no valgrind, no perf.
-    c['builders'].append(BuilderConfig(
-            mergeRequests=True,
-            name="cargo-" + platform,
-            category="cargo",
-            nextSlave=nextSlave,
-            properties={"platform":p,
-                        "branch":"auto-cargo",
-                        "verbose": True,
-                        "cargo": True,
-                        "optimize": False,
-                        "nightly": nightly,
-                        "bits": bits,
-                        "targets": targets,
-                        "build": triple},
-            slavenames=slaves,
-            factory=cargo_buildfactory(platform)))
-
-    if platform not in cargo_dist_platforms:
-        continue
-
-    # Cargo nightly
-    c['builders'].append(BuilderConfig(
-            mergeRequests=True,
-            name="nightly-dist-cargo-" + platform,
-            category="util-dist",
-            properties={"platform":p,
-                        "branch":"master",
-                        "targets": targets,
-                        "check": True,
-                        "wipe": True,
-                        "cargo": True,
-                        "cargo-nightly": True,
-                        "optimize": True,
-                        "bits": bits,
-                        "nightly": True},
-            nextSlave=nextSlave,
-            slavenames=platform_dist_slaves(platform),
-            factory=cargo_nightly_buildfactory(platform, targets)))
-
-
 ####### STATUS TARGETS
 
 # 'status' is a list of Status Targets. The results of each build will be