Skip to content

Commit

Permalink
Auto merge of rust-lang#41157 - aidanhs:aphs-debug-appveyor-cache, r=…
Browse files Browse the repository at this point in the history
…TimNN

Add a comment for disabling errexit, try to debug appveyor cache

Comments added as requested.

Also, lets add some cache debugging to appveyor. I *think* this is how to ignore errors in cmd.exe (and I did try it on my own machine), but I'm not 100% sure how appveyor runs them. In the worst case it'll fail but I guess that isn't the end of the world since the build has already failed by this point.

r? @TimNN
  • Loading branch information
bors committed Apr 16, 2017
2 parents 7627e3d + bb84358 commit 5997806
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 1 addition & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@ test_script:
- sh src/ci/run.sh

on_failure:
- cat %CD%\sccache.log
- cat C:\Users\appveyor\AppData\Local\Temp\1\build-cache-logs\*.log
- cat %CD%\sccache.log || exit 0

cache:
- C:\cache\rustsrc
Expand Down
2 changes: 2 additions & 0 deletions src/ci/init_repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ if [ ! -f "$cache_valid_file" ]; then
rm -rf "$CACHE_DIR"
mkdir "$CACHE_DIR"
else
# Ignore errors while gathering information about the possible brokenness
# of the git repo since our gathered info will tell us something is wrong
set +o errexit
stat_lines=$(cd "$cache_src_dir" && git status --porcelain | wc -l)
stat_ec=$(cd "$cache_src_dir" && git status >/dev/null 2>&1; echo $?)
Expand Down

0 comments on commit 5997806

Please sign in to comment.