Skip to content

Commit 64f7e11

Browse files
committed
Update sccache to its master branch
Ideally I'd like to soon enable sccache for rustbuild itself and some of the stage0 tools, but for that to work we'll need some better Rust support than the pretty old version we were previously using!
1 parent 097efa9 commit 64f7e11

File tree

5 files changed

+12
-23
lines changed

5 files changed

+12
-23
lines changed

.travis.yml

+1-12
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ matrix:
3030
SRC=.
3131
DEPLOY_ALT=1
3232
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
33-
SCCACHE_ERROR_LOG=/tmp/sccache.log
3433
MACOSX_DEPLOYMENT_TARGET=10.7
3534
NO_LLVM_ASSERTIONS=1
3635
NO_DEBUG_ASSERTIONS=1
@@ -50,7 +49,6 @@ matrix:
5049
RUST_CONFIGURE_ARGS="--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler"
5150
SRC=.
5251
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
53-
SCCACHE_ERROR_LOG=/tmp/sccache.log
5452
MACOSX_DEPLOYMENT_TARGET=10.8
5553
MACOSX_STD_DEPLOYMENT_TARGET=10.7
5654
NO_LLVM_ASSERTIONS=1
@@ -64,7 +62,6 @@ matrix:
6462
RUST_CONFIGURE_ARGS=--build=i686-apple-darwin
6563
SRC=.
6664
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
67-
SCCACHE_ERROR_LOG=/tmp/sccache.log
6865
MACOSX_DEPLOYMENT_TARGET=10.8
6966
MACOSX_STD_DEPLOYMENT_TARGET=10.7
7067
NO_LLVM_ASSERTIONS=1
@@ -85,7 +82,6 @@ matrix:
8582
SRC=.
8683
DEPLOY=1
8784
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
88-
SCCACHE_ERROR_LOG=/tmp/sccache.log
8985
MACOSX_DEPLOYMENT_TARGET=10.7
9086
NO_LLVM_ASSERTIONS=1
9187
NO_DEBUG_ASSERTIONS=1
@@ -99,7 +95,6 @@ matrix:
9995
SRC=.
10096
DEPLOY=1
10197
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
102-
SCCACHE_ERROR_LOG=/tmp/sccache.log
10398
MACOSX_DEPLOYMENT_TARGET=10.7
10499
NO_LLVM_ASSERTIONS=1
105100
NO_DEBUG_ASSERTIONS=1
@@ -227,7 +222,7 @@ install:
227222
travis_retry brew update &&
228223
travis_retry brew install xz;
229224
fi &&
230-
travis_retry curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-12-sccache-x86_64-apple-darwin &&
225+
travis_retry curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-apple-darwin &&
231226
chmod +x /usr/local/bin/sccache &&
232227
travis_retry curl -fo /usr/local/bin/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin &&
233228
chmod +x /usr/local/bin/stamp
@@ -268,12 +263,6 @@ after_failure:
268263
df -h;
269264
du . | sort -nr | head -n100
270265
271-
# One of these is the linux sccache log, one is the OSX sccache log. Instead
272-
# of worrying about what system we are just cat both. One of these commands
273-
# will fail but that's ok, they'll both get executed.
274-
- cat obj/tmp/sccache.log
275-
- cat /tmp/sccache.log
276-
277266
# Random attempt at debugging currently. Just poking around in here to see if
278267
# anything shows up.
279268
- ls -lat $HOME/Library/Logs/DiagnosticReports/

appveyor.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ install:
152152
- set PATH=C:\Python27;%PATH%
153153

154154
# Download and install sccache
155-
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-12-sccache-x86_64-pc-windows-msvc
156-
- mv 2017-05-12-sccache-x86_64-pc-windows-msvc sccache.exe
155+
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-pc-windows-msvc
156+
- mv 2018-04-02-sccache-x86_64-pc-windows-msvc sccache.exe
157157
- set PATH=%PATH%;%CD%
158158

159159
# Download and install ninja
@@ -176,19 +176,13 @@ install:
176176
- set PATH=%PATH%;%CD%\handle
177177
- handle.exe -accepteula -help
178178

179-
# Attempt to debug sccache failures
180-
- set SCCACHE_ERROR_LOG=%CD%/sccache.log
181-
182179
test_script:
183180
- if not exist C:\cache\rustsrc\NUL mkdir C:\cache\rustsrc
184181
- sh src/ci/init_repo.sh . /c/cache/rustsrc
185182
- set SRC=.
186183
- set NO_CCACHE=1
187184
- sh src/ci/run.sh
188185

189-
on_failure:
190-
- cat %CD%\sccache.log || exit 0
191-
192186
branches:
193187
only:
194188
- auto

src/ci/docker/dist-various-1/Dockerfile

+8
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@ RUN env \
6666
bash musl.sh mipsel && \
6767
rm -rf /build/*
6868

69+
# FIXME(mozilla/sccache#235) this shouldn't be necessary but is currently
70+
# necessary to disambiguate the mips compiler with the mipsel compiler. We want
71+
# to give these two wrapper scripts (currently identical ones) different hashes
72+
# to ensure that sccache understands that they're different compilers.
73+
RUN \
74+
echo "# a" >> /usr/local/mips-linux-musl/bin/mips-openwrt-linux-musl-wrapper.sh && \
75+
echo "# b" >> /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-musl-wrapper.sh
76+
6977
ENV TARGETS=asmjs-unknown-emscripten
7078
ENV TARGETS=$TARGETS,wasm32-unknown-emscripten
7179
ENV TARGETS=$TARGETS,x86_64-rumprun-netbsd

src/ci/docker/run.sh

-2
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ if [ "$SCCACHE_BUCKET" != "" ]; then
104104
args="$args --env SCCACHE_REGION"
105105
args="$args --env AWS_ACCESS_KEY_ID"
106106
args="$args --env AWS_SECRET_ACCESS_KEY"
107-
args="$args --env SCCACHE_ERROR_LOG=/tmp/sccache/sccache.log"
108-
args="$args --volume $objdir/tmp:/tmp/sccache"
109107
else
110108
mkdir -p $HOME/.cache/sccache
111109
args="$args --env SCCACHE_DIR=/sccache --volume $HOME/.cache/sccache:/sccache"

src/ci/docker/scripts/sccache.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
set -ex
1414

1515
curl -fo /usr/local/bin/sccache \
16-
https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl
16+
https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-unknown-linux-musl
1717

1818
chmod +x /usr/local/bin/sccache

0 commit comments

Comments
 (0)