Skip to content

Commit 94b7683

Browse files
borsbors
committed
Auto merge of #40084 - alexcrichton:update-sccache, r=aturon
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.
2 parents 0823077 + 255a874 commit 94b7683

File tree

26 files changed

+81
-82
lines changed

26 files changed

+81
-82
lines changed

‎.travis.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ matrix:
4545
os: osx
4646
osx_image: xcode8.2
4747
install: &osx_install_sccache >
48-
curl -L https://api.pub.build.mozilla.org/tooltool/sha512/d0025b286468cc5ada83b23d3fafbc936b9f190eaa7d4a981715b18e8e3bf720a7bcee7bfe758cfdeb8268857f6098fd52dcdd8818232692a30ce91039936596 |
49-
tar xJf - -C /usr/local/bin --strip-components=1
48+
curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-apple-darwin &&
49+
chmod +x /usr/local/bin/sccache
5050
- env: >
5151
RUST_CHECK_TARGET=check
5252
RUST_CONFIGURE_ARGS=--build=i686-apple-darwin
@@ -63,8 +63,10 @@ matrix:
6363
os: osx
6464
osx_image: xcode8.2
6565
install: >
66-
curl -L https://api.pub.build.mozilla.org/tooltool/sha512/d0025b286468cc5ada83b23d3fafbc936b9f190eaa7d4a981715b18e8e3bf720a7bcee7bfe758cfdeb8268857f6098fd52dcdd8818232692a30ce91039936596 |
67-
tar xJf - -C /usr/local/bin --strip-components=1 && brew uninstall --ignore-dependencies openssl && brew install openssl --universal --without-test
66+
curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-apple-darwin &&
67+
chmod +x /usr/local/bin/sccache &&
68+
brew uninstall --ignore-dependencies openssl &&
69+
brew install openssl --universal --without-test
6870
- env: >
6971
RUST_CHECK_TARGET=dist
7072
RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended"

‎appveyor.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,9 @@ install:
115115
- set PATH=C:\Python27;%PATH%
116116

117117
# Download and install sccache
118-
- appveyor DownloadFile https://api.pub.build.mozilla.org/tooltool/sha512/%SCCACHE_DIGEST%
119-
- mv %SCCACHE_DIGEST% sccache.tar.bz2
120-
- 7z x -y sccache.tar.bz2 > nul
121-
- 7z x -y sccache.tar > nul
122-
- set PATH=%PATH%;%CD%\sccache2
118+
- appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-pc-windows-msvc
119+
- mv 2017-02-24-sccache-x86_64-pc-windows-msvc sccache
120+
- set PATH=%PATH%;%CD%
123121

124122
# Install InnoSetup to get `iscc` used to produce installers
125123
- choco install -y InnoSetup

‎src/ci/docker/android/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ COPY start-emulator.sh /android/
3535

3636
ENTRYPOINT ["/usr/bin/dumb-init", "--", "/android/start-emulator.sh"]
3737

38-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
39-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
40-
tar xJf - -C /usr/local/bin --strip-components=1
38+
RUN curl -o /usr/local/bin/sccache \
39+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
40+
chmod +x /usr/local/bin/sccache
4141

4242
ENV TARGETS=arm-linux-androideabi
4343
ENV TARGETS=$TARGETS,i686-linux-android

‎src/ci/docker/armhf-gnu/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ RUN arm-linux-gnueabihf-gcc addentropy.c -o rootfs/addentropy -static
7373
# TODO: What is this?!
7474
RUN curl -O http://ftp.nl.debian.org/debian/dists/jessie/main/installer-armhf/current/images/device-tree/vexpress-v2p-ca15-tc1.dtb
7575

76-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
77-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
78-
tar xJf - -C /usr/local/bin --strip-components=1
76+
RUN curl -o /usr/local/bin/sccache \
77+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
78+
chmod +x /usr/local/bin/sccache
7979

8080
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
8181
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/cross/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2121
libssl-dev \
2222
pkg-config
2323

24-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
25-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
26-
tar xJf - -C /usr/local/bin --strip-components=1
24+
RUN curl -o /usr/local/bin/sccache \
25+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
26+
chmod +x /usr/local/bin/sccache
2727

2828
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2929
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/dist-arm-linux/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
libssl-dev \
2828
pkg-config
2929

30-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
31-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
32-
tar xJf - -C /usr/local/bin --strip-components=1
30+
RUN curl -o /usr/local/bin/sccache \
31+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
32+
chmod +x /usr/local/bin/sccache
3333

3434
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
3535
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/dist-armv7-aarch64-linux/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
libssl-dev \
2828
pkg-config
2929

30-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
31-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
32-
tar xJf - -C /usr/local/bin --strip-components=1
30+
RUN curl -o /usr/local/bin/sccache \
31+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
32+
chmod +x /usr/local/bin/sccache
3333

3434
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
3535
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/dist-freebsd/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
2525
rm dumb-init_*.deb
2626
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2727

28-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
29-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
30-
tar xJf - -C /usr/local/bin --strip-components=1
28+
RUN curl -o /usr/local/bin/sccache \
29+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
30+
chmod +x /usr/local/bin/sccache
3131

3232
ENV \
3333
AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-ar \

‎src/ci/docker/dist-mips-linux/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1717
libssl-dev \
1818
pkg-config
1919

20-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
21-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
22-
tar xJf - -C /usr/local/bin --strip-components=1
20+
RUN curl -o /usr/local/bin/sccache \
21+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
22+
chmod +x /usr/local/bin/sccache
2323

2424
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2525
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/dist-mips64-linux/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1717
libssl-dev \
1818
pkg-config
1919

20-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
21-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
22-
tar xJf - -C /usr/local/bin --strip-components=1
20+
RUN curl -o /usr/local/bin/sccache \
21+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
22+
chmod +x /usr/local/bin/sccache
2323

2424
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2525
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/dist-powerpc-linux/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
libssl-dev \
2828
pkg-config
2929

30-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
31-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
32-
tar xJf - -C /usr/local/bin --strip-components=1
30+
RUN curl -o /usr/local/bin/sccache \
31+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
32+
chmod +x /usr/local/bin/sccache
3333

3434
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
3535
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/dist-powerpc64-linux/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
libssl-dev \
2828
pkg-config
2929

30-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
31-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
32-
tar xJf - -C /usr/local/bin --strip-components=1
30+
RUN curl -o /usr/local/bin/sccache \
31+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
32+
chmod +x /usr/local/bin/sccache
3333

3434
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
3535
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/dist-s390x-linux-netbsd/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
libssl-dev \
2828
pkg-config
2929

30-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
31-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
32-
tar xJf - -C /usr/local/bin --strip-components=1
30+
RUN curl -o /usr/local/bin/sccache \
31+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
32+
chmod +x /usr/local/bin/sccache
3333

3434
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
3535
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/dist-x86-linux/Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,9 @@ RUN curl -Lo /rustroot/dumb-init \
7474
chmod +x /rustroot/dumb-init
7575
ENTRYPOINT ["/rustroot/dumb-init", "--"]
7676

77-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
78-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
79-
xz --decompress | \
80-
tar xf - -C /usr/local/bin --strip-components=1
77+
RUN curl -o /usr/local/bin/sccache \
78+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
79+
chmod +x /usr/local/bin/sccache
8180

8281
ENV HOSTS=i686-unknown-linux-gnu
8382
ENV HOSTS=$HOSTS,x86_64-unknown-linux-gnu

‎src/ci/docker/emscripten/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1414
xz-utils \
1515
lib32stdc++6
1616

17-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
18-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
19-
tar xJf - -C /usr/local/bin --strip-components=1
17+
RUN curl -o /usr/local/bin/sccache \
18+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
19+
chmod +x /usr/local/bin/sccache
2020

2121
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2222
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/i686-gnu-nopt/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1313
gdb \
1414
xz-utils
1515

16-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
17-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
18-
tar xJf - -C /usr/local/bin --strip-components=1
16+
RUN curl -o /usr/local/bin/sccache \
17+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
18+
chmod +x /usr/local/bin/sccache
1919

2020
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2121
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/i686-gnu/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1313
gdb \
1414
xz-utils
1515

16-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
17-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
18-
tar xJf - -C /usr/local/bin --strip-components=1
16+
RUN curl -o /usr/local/bin/sccache \
17+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
18+
chmod +x /usr/local/bin/sccache
1919

2020
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2121
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/linux-tested-targets/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
2525
rm dumb-init_*.deb
2626
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2727

28-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
29-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
30-
tar xJf - -C /usr/local/bin --strip-components=1
28+
RUN curl -o /usr/local/bin/sccache \
29+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
30+
chmod +x /usr/local/bin/sccache
3131

3232
ENV RUST_CONFIGURE_ARGS \
3333
--target=x86_64-unknown-linux-musl,i686-unknown-linux-musl,i586-unknown-linux-gnu \

‎src/ci/docker/x86_64-gnu-aux/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1414
xz-utils \
1515
pkg-config
1616

17-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
18-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
19-
tar xJf - -C /usr/local/bin --strip-components=1
17+
RUN curl -o /usr/local/bin/sccache \
18+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
19+
chmod +x /usr/local/bin/sccache
2020

2121
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2222
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/x86_64-gnu-debug/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1313
gdb \
1414
xz-utils
1515

16-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
17-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
18-
tar xJf - -C /usr/local/bin --strip-components=1
16+
RUN curl -o /usr/local/bin/sccache \
17+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
18+
chmod +x /usr/local/bin/sccache
1919

2020
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2121
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/x86_64-gnu-distcheck/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1515
libssl-dev \
1616
pkg-config
1717

18-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
19-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
20-
tar xJf - -C /usr/local/bin --strip-components=1
18+
RUN curl -o /usr/local/bin/sccache \
19+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
20+
chmod +x /usr/local/bin/sccache
2121

2222
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2323
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/x86_64-gnu-full-bootstrap/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1313
gdb \
1414
xz-utils
1515

16-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
17-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
18-
tar xJf - -C /usr/local/bin --strip-components=1
16+
RUN curl -o /usr/local/bin/sccache \
17+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
18+
chmod +x /usr/local/bin/sccache
1919

2020
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2121
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/x86_64-gnu-incremental/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1313
gdb \
1414
xz-utils
1515

16-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
17-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
18-
tar xJf - -C /usr/local/bin --strip-components=1
16+
RUN curl -o /usr/local/bin/sccache \
17+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
18+
chmod +x /usr/local/bin/sccache
1919

2020
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2121
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1616
zlib1g-dev \
1717
xz-utils
1818

19-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
20-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
21-
tar xJf - -C /usr/local/bin --strip-components=1
19+
RUN curl -o /usr/local/bin/sccache \
20+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
21+
chmod +x /usr/local/bin/sccache
2222

2323
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2424
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/x86_64-gnu-nopt/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1313
gdb \
1414
xz-utils
1515

16-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
17-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
18-
tar xJf - -C /usr/local/bin --strip-components=1
16+
RUN curl -o /usr/local/bin/sccache \
17+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
18+
chmod +x /usr/local/bin/sccache
1919

2020
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2121
dpkg -i dumb-init_*.deb && \

‎src/ci/docker/x86_64-gnu/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1313
gdb \
1414
xz-utils
1515

16-
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
17-
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \
18-
tar xJf - -C /usr/local/bin --strip-components=1
16+
RUN curl -o /usr/local/bin/sccache \
17+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-unknown-linux-gnu && \
18+
chmod +x /usr/local/bin/sccache
1919

2020
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
2121
dpkg -i dumb-init_*.deb && \

0 commit comments

Comments
 (0)