Skip to content

Commit 2e72bcb

Browse files
alexcrichtonalexcrichton
committed
appveyor: Use Ninja/sccache on MSVC
Now that the final bug fixes have been merged into sccache we can start leveraging sccache on the MSVC builders on AppVeyor instead of relying on the ad-hoc caching strategy of trigger files and whatnot.
1 parent 499b84a commit 2e72bcb

File tree

39 files changed

+134
-56
lines changed

39 files changed

+134
-56
lines changed

Diff for: ‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ matrix:
6363
os: osx
6464
osx_image: xcode8.2
6565
install: &osx_install_sccache >
66-
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-apple-darwin &&
66+
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-apple-darwin &&
6767
chmod +x /usr/local/bin/sccache &&
6868
travis_retry curl -o /usr/local/bin/stamp https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin &&
6969
chmod +x /usr/local/bin/stamp

Diff for: ‎appveyor.yml

+7-12
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ environment:
3232
# came from the mingw-w64 SourceForge download site. Unfortunately
3333
# SourceForge is notoriously flaky, so we mirror it on our own infrastructure.
3434
- MSYS_BITS: 32
35-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-ninja
35+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
3636
SCRIPT: python x.py test
3737
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
3838
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
3939
MINGW_DIR: mingw32
4040
- MSYS_BITS: 64
4141
SCRIPT: python x.py test
42-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-ninja
42+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
4343
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
4444
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
4545
MINGW_DIR: mingw64
@@ -57,15 +57,15 @@ environment:
5757
SCRIPT: python x.py dist
5858
DEPLOY: 1
5959
- MSYS_BITS: 32
60-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-extended --enable-ninja
60+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-extended
6161
SCRIPT: python x.py dist
6262
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
6363
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
6464
MINGW_DIR: mingw32
6565
DEPLOY: 1
6666
- MSYS_BITS: 64
6767
SCRIPT: python x.py dist
68-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-extended --enable-ninja
68+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-extended
6969
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
7070
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
7171
MINGW_DIR: mingw64
@@ -124,15 +124,16 @@ install:
124124
- set PATH=C:\Python27;%PATH%
125125

126126
# Download and install sccache
127-
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-pc-windows-msvc
128-
- mv 2017-04-09-sccache-x86_64-pc-windows-msvc sccache.exe
127+
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-pc-windows-msvc
128+
- mv 2017-04-19-sccache-x86_64-pc-windows-msvc sccache.exe
129129
- set PATH=%PATH%;%CD%
130130

131131
# Download and install ninja
132132
#
133133
# Note that this is originally from the github releases patch of Ninja
134134
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-15-ninja-win.zip
135135
- 7z x 2017-03-15-ninja-win.zip
136+
- set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --enable-ninja
136137
# - set PATH=%PATH%;%CD% -- this already happens above for sccache
137138

138139
# Install InnoSetup to get `iscc` used to produce installers
@@ -159,12 +160,6 @@ test_script:
159160
on_failure:
160161
- cat %CD%\sccache.log || exit 0
161162

162-
cache:
163-
- "build/i686-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger"
164-
- "build/x86_64-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger"
165-
- "i686-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger"
166-
- "x86_64-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger"
167-
168163
branches:
169164
only:
170165
- auto

Diff for: ‎src/bootstrap/Cargo.toml

+5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ name = "rustdoc"
2323
path = "bin/rustdoc.rs"
2424
test = false
2525

26+
[[bin]]
27+
name = "sccache-plus-cl"
28+
path = "bin/sccache-plus-cl.rs"
29+
test = false
30+
2631
[dependencies]
2732
build_helper = { path = "../build_helper" }
2833
cmake = "0.1.17"

Diff for: ‎src/bootstrap/bin/sccache-plus-cl.rs

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
extern crate gcc;
12+
13+
use std::env;
14+
use std::process::{self, Command};
15+
16+
fn main() {
17+
let target = env::var("SCCACHE_TARGET").unwrap();
18+
// Locate the actual compiler that we're invoking
19+
env::remove_var("CC");
20+
env::remove_var("CXX");
21+
let mut cfg = gcc::Config::new();
22+
cfg.cargo_metadata(false)
23+
.out_dir("/")
24+
.target(&target)
25+
.host(&target)
26+
.opt_level(0)
27+
.debug(false);
28+
let compiler = cfg.get_compiler();
29+
30+
// Invoke sccache with said compiler
31+
let sccache_path = env::var_os("SCCACHE_PATH").unwrap();
32+
let mut cmd = Command::new(&sccache_path);
33+
cmd.arg(compiler.path());
34+
for &(ref k, ref v) in compiler.env() {
35+
cmd.env(k, v);
36+
}
37+
for arg in env::args().skip(1) {
38+
cmd.arg(arg);
39+
}
40+
41+
let status = cmd.status().expect("failed to spawn");
42+
process::exit(status.code().unwrap_or(2))
43+
}

Diff for: ‎src/bootstrap/native.rs

+44-9
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
//! ensure that they're always in place if needed.
2020
2121
use std::env;
22+
use std::ffi::OsString;
2223
use std::fs::{self, File};
2324
use std::io::{Read, Write};
2425
use std::path::Path;
@@ -129,22 +130,56 @@ pub fn llvm(build: &Build, target: &str) {
129130
.define("LLVM_TABLEGEN", &host);
130131
}
131132

132-
// MSVC handles compiler business itself
133-
if !target.contains("msvc") {
134-
if let Some(ref ccache) = build.config.ccache {
133+
let sanitize_cc = |cc: &Path| {
134+
if target.contains("msvc") {
135+
OsString::from(cc.to_str().unwrap().replace("\\", "/"))
136+
} else {
137+
cc.as_os_str().to_owned()
138+
}
139+
};
140+
141+
let configure_compilers = |cfg: &mut cmake::Config| {
142+
// MSVC with CMake uses msbuild by default which doesn't respect these
143+
// vars that we'd otherwise configure. In that case we just skip this
144+
// entirely.
145+
if target.contains("msvc") && !build.config.ninja {
146+
return
147+
}
148+
149+
let cc = build.cc(target);
150+
let cxx = build.cxx(target);
151+
152+
// Handle msvc + ninja + ccache specially (this is what the bots use)
153+
if target.contains("msvc") &&
154+
build.config.ninja &&
155+
build.config.ccache.is_some() {
156+
let mut cc = env::current_exe().expect("failed to get cwd");
157+
cc.set_file_name("sccache-plus-cl.exe");
158+
159+
cfg.define("CMAKE_C_COMPILER", sanitize_cc(&cc))
160+
.define("CMAKE_CXX_COMPILER", sanitize_cc(&cc));
161+
cfg.env("SCCACHE_PATH",
162+
build.config.ccache.as_ref().unwrap())
163+
.env("SCCACHE_TARGET", target);
164+
165+
// If ccache is configured we inform the build a little differently hwo
166+
// to invoke ccache while also invoking our compilers.
167+
} else if let Some(ref ccache) = build.config.ccache {
135168
cfg.define("CMAKE_C_COMPILER", ccache)
136-
.define("CMAKE_C_COMPILER_ARG1", build.cc(target))
169+
.define("CMAKE_C_COMPILER_ARG1", sanitize_cc(cc))
137170
.define("CMAKE_CXX_COMPILER", ccache)
138-
.define("CMAKE_CXX_COMPILER_ARG1", build.cxx(target));
171+
.define("CMAKE_CXX_COMPILER_ARG1", sanitize_cc(cxx));
139172
} else {
140-
cfg.define("CMAKE_C_COMPILER", build.cc(target))
141-
.define("CMAKE_CXX_COMPILER", build.cxx(target));
173+
cfg.define("CMAKE_C_COMPILER", sanitize_cc(cc))
174+
.define("CMAKE_CXX_COMPILER", sanitize_cc(cxx));
142175
}
143-
cfg.build_arg("-j").build_arg(build.jobs().to_string());
144176

177+
cfg.build_arg("-j").build_arg(build.jobs().to_string());
145178
cfg.define("CMAKE_C_FLAGS", build.cflags(target).join(" "));
146179
cfg.define("CMAKE_CXX_FLAGS", build.cflags(target).join(" "));
147-
}
180+
};
181+
182+
configure_compilers(&mut cfg);
148183

149184
if env::var_os("SCCACHE_ERROR_LOG").is_some() {
150185
cfg.env("RUST_LOG", "sccache=info");

Diff for: ‎src/ci/docker/armhf-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ RUN arm-linux-gnueabihf-gcc addentropy.c -o rootfs/addentropy -static
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

7676
RUN curl -o /usr/local/bin/sccache \
77-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
77+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
7878
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 && \

Diff for: ‎src/ci/docker/cross/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2222
pkg-config
2323

2424
RUN curl -o /usr/local/bin/sccache \
25-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
25+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
2626
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 && \

Diff for: ‎src/ci/docker/dist-aarch64-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN ./build-toolchains.sh
6262
USER root
6363

6464
RUN curl -o /usr/local/bin/sccache \
65-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
65+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
6666
chmod +x /usr/local/bin/sccache
6767

6868
ENV PATH=$PATH:/x-tools/aarch64-unknown-linux-gnueabi/bin

Diff for: ‎src/ci/docker/dist-android/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
3232
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
3333

3434
RUN curl -o /usr/local/bin/sccache \
35-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
35+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
3636
chmod +x /usr/local/bin/sccache
3737

3838
ENV TARGETS=arm-linux-androideabi

Diff for: ‎src/ci/docker/dist-arm-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN ./build-toolchains.sh
6262
USER root
6363

6464
RUN curl -o /usr/local/bin/sccache \
65-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
65+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
6666
chmod +x /usr/local/bin/sccache
6767

6868
ENV PATH=$PATH:/x-tools/arm-unknown-linux-gnueabi/bin

Diff for: ‎src/ci/docker/dist-armhf-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN ./build-toolchains.sh
6262
USER root
6363

6464
RUN curl -o /usr/local/bin/sccache \
65-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
65+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
6666
chmod +x /usr/local/bin/sccache
6767

6868
ENV PATH=$PATH:/x-tools/arm-unknown-linux-gnueabihf/bin

Diff for: ‎src/ci/docker/dist-armv7-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN ./build-toolchains.sh
6262
USER root
6363

6464
RUN curl -o /usr/local/bin/sccache \
65-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
65+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
6666
chmod +x /usr/local/bin/sccache
6767

6868
ENV PATH=$PATH:/x-tools/armv7-unknown-linux-gnueabihf/bin

Diff for: ‎src/ci/docker/dist-fuchsia/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
3030
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
3131

3232
RUN curl -o /usr/local/bin/sccache \
33-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
33+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
3434
chmod +x /usr/local/bin/sccache
3535

3636
ENV \

Diff for: ‎src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
2626
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2727

2828
RUN curl -o /usr/local/bin/sccache \
29-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
29+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
3030
chmod +x /usr/local/bin/sccache
3131

3232
ENV RUST_CONFIGURE_ARGS \

Diff for: ‎src/ci/docker/dist-i686-freebsd/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
2525
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2626

2727
RUN curl -o /usr/local/bin/sccache \
28-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
28+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
2929
chmod +x /usr/local/bin/sccache
3030

3131
ENV \

Diff for: ‎src/ci/docker/dist-i686-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN curl -Lo /rustroot/dumb-init \
8282
ENTRYPOINT ["/rustroot/dumb-init", "--"]
8383

8484
RUN curl -o /usr/local/bin/sccache \
85-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
85+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
8686
chmod +x /usr/local/bin/sccache
8787

8888
ENV HOSTS=i686-unknown-linux-gnu

Diff for: ‎src/ci/docker/dist-mips-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1717
pkg-config
1818

1919
RUN curl -o /usr/local/bin/sccache \
20-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
20+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
2121
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 && \

Diff for: ‎src/ci/docker/dist-mips64-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1717
pkg-config
1818

1919
RUN curl -o /usr/local/bin/sccache \
20-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
20+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
2121
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 && \

Diff for: ‎src/ci/docker/dist-mips64el-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1717
pkg-config
1818

1919
RUN curl -o /usr/local/bin/sccache \
20-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
20+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
2121
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 && \

Diff for: ‎src/ci/docker/dist-mipsel-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1717
pkg-config
1818

1919
RUN curl -o /usr/local/bin/sccache \
20-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
20+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
2121
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 && \

Diff for: ‎src/ci/docker/dist-powerpc-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RUN ./build-powerpc-toolchain.sh
6363
USER root
6464

6565
RUN curl -o /usr/local/bin/sccache \
66-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
66+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
6767
chmod +x /usr/local/bin/sccache
6868

6969
ENV PATH=$PATH:/x-tools/powerpc-unknown-linux-gnu/bin

Diff for: ‎src/ci/docker/dist-powerpc64-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RUN ./build-powerpc64-toolchain.sh
6363
USER root
6464

6565
RUN curl -o /usr/local/bin/sccache \
66-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
66+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
6767
chmod +x /usr/local/bin/sccache
6868

6969
ENV PATH=$PATH:/x-tools/powerpc64-unknown-linux-gnu/bin

Diff for: ‎src/ci/docker/dist-powerpc64le-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ COPY shared.sh build-powerpc64le-toolchain.sh /tmp/
6363
RUN ./build-powerpc64le-toolchain.sh
6464

6565
RUN curl -o /usr/local/bin/sccache \
66-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
66+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
6767
chmod +x /usr/local/bin/sccache
6868

6969
ENV \

Diff for: ‎src/ci/docker/dist-s390x-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RUN ./build-s390x-toolchain.sh
6363
USER root
6464

6565
RUN curl -o /usr/local/bin/sccache \
66-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
66+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
6767
chmod +x /usr/local/bin/sccache
6868

6969
ENV PATH=$PATH:/x-tools/s390x-ibm-linux-gnu/bin

Diff for: ‎src/ci/docker/dist-x86_64-freebsd/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
2525
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2626

2727
RUN curl -o /usr/local/bin/sccache \
28-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
28+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
2929
chmod +x /usr/local/bin/sccache
3030

3131
ENV \

Diff for: ‎src/ci/docker/dist-x86_64-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN curl -Lo /rustroot/dumb-init \
8282
ENTRYPOINT ["/rustroot/dumb-init", "--"]
8383

8484
RUN curl -o /usr/local/bin/sccache \
85-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-unknown-linux-musl && \
85+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-19-sccache-x86_64-unknown-linux-musl && \
8686
chmod +x /usr/local/bin/sccache
8787

8888
ENV HOSTS=x86_64-unknown-linux-gnu

0 commit comments

Comments
 (0)