diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-04-19 21:55:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 21:55:41 -0400 |
| commit | 7b5ec6c07ead3b58477a186794ed0ba689794eb5 (patch) | |
| tree | 381fd5563e7885acdc81f853173bf3f3c08c36d6 | |
| parent | 80fa79821a2119cda637357be3f44edc03f0da8b (diff) | |
| parent | 24640b306ea27371b18317c0b8b4823b07f570fa (diff) | |
| download | rust-7b5ec6c07ead3b58477a186794ed0ba689794eb5.tar.gz rust-7b5ec6c07ead3b58477a186794ed0ba689794eb5.zip | |
Rollup merge of #41398 - aidanhs:aphs-no-git-caches-again, r=alexcrichton
Disable git caches again The appveyor ones aren't working anyway (I need to talk to appveyor about them being corrupt) and the travis cache is taking too long to restore and is being killed, which is sometimes causing bad things to happen because the integrity checking made assumptions that restore was atomic. I could fix the integrity checks, but we clearly need a different approach if restore is taking too long. Let's disable it all for now.
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | appveyor.yml | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 0ffba70d2ef..5d56379dcce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -192,10 +192,6 @@ before_cache: grep -v missing | xargs docker save | gzip > $HOME/docker/rust-ci.tar.gz - - if [ ! -f $HOME/rustsrc/cache_valid1 ]; then - echo "WARNING rustsrc cache was invalid when saving"; - rm -rf $HOME/rustsrc && mkdir $HOME/rustsrc; - fi before_install: - zcat $HOME/docker/rust-ci.tar.gz | docker load || true - mkdir -p $HOME/rustsrc @@ -206,7 +202,6 @@ notifications: cache: directories: - $HOME/docker - - $HOME/rustsrc before_deploy: - mkdir -p deploy/$TRAVIS_COMMIT diff --git a/appveyor.yml b/appveyor.yml index 978ca0d9739..5de5f3bd26c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -151,7 +151,6 @@ on_failure: - cat %CD%\sccache.log || exit 0 cache: - - C:\cache\rustsrc - "build/i686-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger" - "build/x86_64-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger" - "i686-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger" |