diff --git a/master.cfg b/master.cfg index a6b52e0..5a4e432 100644 --- a/master.cfg +++ b/master.cfg @@ -28,7 +28,7 @@ assert CLIENT_SECRET # a Worker object, specifying a unique worker name and password. The same # worker name and password must be configured on the worker. -c["workers"] = [worker.Worker("example-worker", "pass")] +c["workers"] = [worker.Worker("worker-rust", "pass")] if "BUILDBOT_MQ_URL" in os.environ: c["mq"] = { @@ -88,7 +88,7 @@ factory.addStep( ) factory.addStep(steps.ShellCommand(command=["cargo", "test"])) c["builders"].append( - util.BuilderConfig(name="runtests", workernames=["example-worker"], factory=factory) + util.BuilderConfig(name="runtests", workernames=["worker-rust"], factory=factory) ) builderNames.append("runtests") @@ -110,7 +110,7 @@ factory.addStep( ) ) c["builders"].append( - util.BuilderConfig(name="clippy", workernames=["example-worker"], factory=factory) + util.BuilderConfig(name="clippy", workernames=["worker-rust"], factory=factory) ) builderNames.append("clippy") @@ -128,7 +128,7 @@ factory.addStep( ) ) c["builders"].append( - util.BuilderConfig(name="rustdoc", workernames=["example-worker"], factory=factory) + util.BuilderConfig(name="rustdoc", workernames=["worker-rust"], factory=factory) ) builderNames.append("rustdoc") @@ -147,7 +147,7 @@ factory.addStep( ) c["builders"].append( util.BuilderConfig( - name="fmt-check", workernames=["example-worker"], factory=factory + name="fmt-check", workernames=["worker-rust"], factory=factory ) ) builderNames.append("fmt-check") diff --git a/simple/docker-compose.yml b/simple/docker-compose.yml index 9f6e2ef..52ff8d0 100644 --- a/simple/docker-compose.yml +++ b/simple/docker-compose.yml @@ -43,7 +43,7 @@ services: environment: BUILDMASTER: buildbot BUILDMASTER_PORT: 9989 - WORKERNAME: example-worker + WORKERNAME: worker-rust WORKERPASS: pass WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST networks: diff --git a/worker/Dockerfile b/worker/Dockerfile index 821bfd1..f9be6bc 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -5,4 +5,5 @@ USER buildbot WORKDIR /buildbot COPY buildbot.tac /buildbot/buildbot.tac RUN rustup component add clippy +RUN rustup component add rustfmt CMD ["/usr/bin/dumb-init", "twistd", "--pidfile=", "-ny", "buildbot.tac"]