about summary refs log tree commit diff
path: root/src/ci/docker/x86_64-gnu-nopt
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-02-24 13:16:54 -0800
committerAlex Crichton <alex@alexcrichton.com>2017-02-24 13:16:54 -0800
commit255a87499dece27cd400f387506336360a3d07fd (patch)
tree73e2e899cf5256fc17e07121cd251c6c8d5c96a0 /src/ci/docker/x86_64-gnu-nopt
parentbfe45974a18af63191d40a6ac5beb0cf2ab9c9f7 (diff)
downloadrust-255a87499dece27cd400f387506336360a3d07fd.tar.gz
rust-255a87499dece27cd400f387506336360a3d07fd.zip
Update sccache binaries on CI
Currently CI builds can fail spuriously during the LLVM build (#39003). I
believe this is due to sccache, and I believe that in turn was due to the fact
that the sccache server used to just be a raw mio server. Historically raw mio
servers are quite complicated to get right, but this is why we built Tokio! The
sccache server has been migrated to Tokio which I suspect would fix any latent
issues.

I have no confirmation of this (never been able to reproduce the deadlock
locally), but my hunch is that updating sccache to the master branch will fix
the timeouts during the LLVM build.

The binaries previously came from Gecko's infrastructure, but I've built new
ones by hand for Win/Mac/Linux and uploaded them to our CI bucket.
Diffstat (limited to 'src/ci/docker/x86_64-gnu-nopt')
-rw-r--r--src/ci/docker/x86_64-gnu-nopt/Dockerfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ci/docker/x86_64-gnu-nopt/Dockerfile b/src/ci/docker/x86_64-gnu-nopt/Dockerfile
index d28dc3de1b4..42570fba7cb 100644
--- a/src/ci/docker/x86_64-gnu-nopt/Dockerfile
+++ b/src/ci/docker/x86_64-gnu-nopt/Dockerfile
@@ -13,9 +13,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   gdb \
   xz-utils
 
-ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
-RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
-      tar xJf - -C /usr/local/bin --strip-components=1
+RUN curl -o /usr/local/bin/sccache \
+      https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
+      chmod +x /usr/local/bin/sccache
 
 RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
     dpkg -i dumb-init_*.deb && \