Merge pull request #965 from lzutao/missed-sccache

Fix broken cache by updating sccache version
This commit is contained in:
Eric Huss 2019-06-29 13:42:43 -07:00 committed by GitHub
commit 3e652b5bfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 15 deletions

View File

@ -4,8 +4,6 @@ cache:
directories: directories:
- "$HOME/.cargo" - "$HOME/.cargo"
- "$HOME/.cache/sccache" - "$HOME/.cache/sccache"
before_cache:
- rm -rf "$HOME/.cargo/registry"
env: env:
global: global:
@ -27,28 +25,28 @@ matrix:
env: TARGET=x86_64-apple-darwin env: TARGET=x86_64-apple-darwin
before_install: before_install:
- export SCCACHE_VER=0.2.8 RUSTC_WRAPPER=sccache - |
- case "$TRAVIS_OS_NAME" in export RUSTC_WRAPPER=sccache;
cd "$(mktemp -d)";
case "$TRAVIS_OS_NAME" in
linux ) linux )
cd /tmp travis_retry curl -sSL 'https://github.com/mozilla/sccache/releases/download/0.2.9/sccache-0.2.9-x86_64-unknown-linux-musl.tar.gz' | tar -xzf - --strip-components=1 &&
&& travis_retry curl -sSL "https://github.com/mozilla/sccache/releases/download/${SCCACHE_VER}/sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz" | tar xzf - sudo cp sccache /usr/local/bin/sccache;
&& sudo mv "sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl/sccache" /usr/local/bin/sccache;
;; ;;
osx ) osx )
cd "${TMPDIR}" travis_retry curl -sSL 'https://github.com/mozilla/sccache/releases/download/0.2.9/sccache-0.2.9-x86_64-apple-darwin.tar.gz' | tar -xzf - --strip-components=1 &&
&& travis_retry curl -sSL "https://github.com/mozilla/sccache/releases/download/${SCCACHE_VER}/sccache-${SCCACHE_VER}-x86_64-apple-darwin.tar.gz" | tar xzf - sudo cp sccache /usr/local/bin/sccache;
&& sudo mv "sccache-${SCCACHE_VER}-x86_64-apple-darwin/sccache" /usr/local/bin/sccache;
;; ;;
* ) unset RUSTC_WRAPPER;; * ) unset RUSTC_WRAPPER;;
esac esac;
- cd "$TRAVIS_BUILD_DIR" cd "$TRAVIS_BUILD_DIR";
script: script:
- cargo test --all - cargo test --all
- cargo test --all --no-default-features - cargo test --all --no-default-features
- if [ "$TARGET" = x86_64-unknown-linux-gnu ] && [ "$TRAVIS_RUST_VERSION" = stable ]; then - |
rustup component add rustfmt; if [ "$TARGET" = x86_64-unknown-linux-gnu ] && [ "$TRAVIS_RUST_VERSION" = stable ]; then
rustfmt -vV; rustup component add rustfmt && \
cargo fmt --all -- --check; cargo fmt --all -- --check;
fi fi