Update sccache to its master branch

.travis.yml

@@ -30,7 +30,6 @@ matrix:
  SRC=.
  DEPLOY_ALT=1
  RUSTC_RETRY_LINKER_ON_SEGFAULT=1
- SCCACHE_ERROR_LOG=/tmp/sccache.log
  MACOSX_DEPLOYMENT_TARGET=10.7
  NO_LLVM_ASSERTIONS=1
  NO_DEBUG_ASSERTIONS=1
@@ -50,7 +49,6 @@ matrix:
  RUST_CONFIGURE_ARGS="--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler"
  SRC=.
  RUSTC_RETRY_LINKER_ON_SEGFAULT=1
- SCCACHE_ERROR_LOG=/tmp/sccache.log
  MACOSX_DEPLOYMENT_TARGET=10.8
  MACOSX_STD_DEPLOYMENT_TARGET=10.7
  NO_LLVM_ASSERTIONS=1
@@ -64,7 +62,6 @@ matrix:
  RUST_CONFIGURE_ARGS=--build=i686-apple-darwin
  SRC=.
  RUSTC_RETRY_LINKER_ON_SEGFAULT=1
- SCCACHE_ERROR_LOG=/tmp/sccache.log
  MACOSX_DEPLOYMENT_TARGET=10.8
  MACOSX_STD_DEPLOYMENT_TARGET=10.7
  NO_LLVM_ASSERTIONS=1
@@ -85,7 +82,6 @@ matrix:
  SRC=.
  DEPLOY=1
  RUSTC_RETRY_LINKER_ON_SEGFAULT=1
- SCCACHE_ERROR_LOG=/tmp/sccache.log
  MACOSX_DEPLOYMENT_TARGET=10.7
  NO_LLVM_ASSERTIONS=1
  NO_DEBUG_ASSERTIONS=1
@@ -99,7 +95,6 @@ matrix:
  SRC=.
  DEPLOY=1
  RUSTC_RETRY_LINKER_ON_SEGFAULT=1
- SCCACHE_ERROR_LOG=/tmp/sccache.log
  MACOSX_DEPLOYMENT_TARGET=10.7
  NO_LLVM_ASSERTIONS=1
  NO_DEBUG_ASSERTIONS=1
@@ -227,7 +222,7 @@ install:
  travis_retry brew update &&
  travis_retry brew install xz;
  fi &&
- 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 &&
+ 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 &&
  chmod +x /usr/local/bin/sccache &&
  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 &&
  chmod +x /usr/local/bin/stamp
@@ -268,12 +263,6 @@ after_failure:
  df -h;
  du . | sort -nr | head -n100
 
- # One of these is the linux sccache log, one is the OSX sccache log. Instead
- # of worrying about what system we are just cat both. One of these commands
- # will fail but that's ok, they'll both get executed.
- - cat obj/tmp/sccache.log
- - cat /tmp/sccache.log
-
  # Random attempt at debugging currently. Just poking around in here to see if
  # anything shows up.
  - ls -lat $HOME/Library/Logs/DiagnosticReports/

appveyor.yml

@@ -152,8 +152,8 @@ install:
  - set PATH=C:\Python27;%PATH%
 
  # Download and install sccache
- - 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
- - mv 2017-05-12-sccache-x86_64-pc-windows-msvc sccache.exe
+ - 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
+ - mv 2018-04-02-sccache-x86_64-pc-windows-msvc sccache.exe
  - set PATH=%PATH%;%CD%
 
  # Download and install ninja
@@ -176,19 +176,13 @@ install:
  - set PATH=%PATH%;%CD%\handle
  - handle.exe -accepteula -help
 
- # Attempt to debug sccache failures
- - set SCCACHE_ERROR_LOG=%CD%/sccache.log
-
 test_script:
  - if not exist C:\cache\rustsrc\NUL mkdir C:\cache\rustsrc
  - sh src/ci/init_repo.sh . /c/cache/rustsrc
  - set SRC=.
  - set NO_CCACHE=1
  - sh src/ci/run.sh
 
-on_failure:
- - cat %CD%\sccache.log || exit 0
-
 branches:
  only:
  - auto

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

@@ -66,6 +66,14 @@ RUN env \
  bash musl.sh mipsel && \
  rm -rf /build/*
 
+# FIXME(mozilla/sccache#235) this shouldn't be necessary but is currently
+# necessary to disambiguate the mips compiler with the mipsel compiler. We want
+# to give these two wrapper scripts (currently identical ones) different hashes
+# to ensure that sccache understands that they're different compilers.
+RUN \
+ echo "# a" >> /usr/local/mips-linux-musl/bin/mips-openwrt-linux-musl-wrapper.sh && \
+ echo "# b" >> /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-musl-wrapper.sh
+
 ENV TARGETS=asmjs-unknown-emscripten
 ENV TARGETS=$TARGETS,wasm32-unknown-emscripten
 ENV TARGETS=$TARGETS,x86_64-rumprun-netbsd

src/ci/docker/run.sh

@@ -104,8 +104,6 @@ if [ "$SCCACHE_BUCKET" != "" ]; then
  args="$args --env SCCACHE_REGION"
  args="$args --env AWS_ACCESS_KEY_ID"
  args="$args --env AWS_SECRET_ACCESS_KEY"
- args="$args --env SCCACHE_ERROR_LOG=/tmp/sccache/sccache.log"
- args="$args --volume $objdir/tmp:/tmp/sccache"
 else
  mkdir -p $HOME/.cache/sccache
  args="$args --env SCCACHE_DIR=/sccache --volume $HOME/.cache/sccache:/sccache"

src/ci/docker/scripts/sccache.sh

@@ -13,6 +13,6 @@
 set -ex
 
 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-unknown-linux-musl
+ https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-unknown-linux-musl
 
 chmod +x /usr/local/bin/sccache