Skip to content

Commit 8efa218

Browse files
authored
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.
2 parents 644b5b1 + 24640b3 commit 8efa218

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

.travis.yml

-5
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,6 @@ before_cache:
192192
grep -v missing |
193193
xargs docker save |
194194
gzip > $HOME/docker/rust-ci.tar.gz
195-
- if [ ! -f $HOME/rustsrc/cache_valid1 ]; then
196-
echo "WARNING rustsrc cache was invalid when saving";
197-
rm -rf $HOME/rustsrc && mkdir $HOME/rustsrc;
198-
fi
199195
before_install:
200196
- zcat $HOME/docker/rust-ci.tar.gz | docker load || true
201197
- mkdir -p $HOME/rustsrc
@@ -206,7 +202,6 @@ notifications:
206202
cache:
207203
directories:
208204
- $HOME/docker
209-
- $HOME/rustsrc
210205

211206
before_deploy:
212207
- mkdir -p deploy/$TRAVIS_COMMIT

appveyor.yml

-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ on_failure:
151151
- cat %CD%\sccache.log || exit 0
152152

153153
cache:
154-
- C:\cache\rustsrc
155154
- "build/i686-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger"
156155
- "build/x86_64-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger"
157156
- "i686-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger"

0 commit comments

Comments
 (0)