Skip to content

Commit c929359

Browse files
authored
Rollup merge of #41157 - aidanhs:aphs-debug-appveyor-cache, r=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
2 parents ced2f61 + bb84358 commit c929359

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

appveyor.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@ test_script:
148148
- sh src/ci/run.sh
149149

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

154153
cache:
155154
- C:\cache\rustsrc

src/ci/init_repo.sh

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ if [ ! -f "$cache_valid_file" ]; then
4141
rm -rf "$CACHE_DIR"
4242
mkdir "$CACHE_DIR"
4343
else
44+
# Ignore errors while gathering information about the possible brokenness
45+
# of the git repo since our gathered info will tell us something is wrong
4446
set +o errexit
4547
stat_lines=$(cd "$cache_src_dir" && git status --porcelain | wc -l)
4648
stat_ec=$(cd "$cache_src_dir" && git status >/dev/null 2>&1; echo $?)

0 commit comments

Comments
 (0)