Skip to content

Commit 547c12b

Browse files
committed
Auto merge of #41147 - aidanhs:aphs-fix-appveyor-cache, r=TimNN
Disable errexit for sanity checking git repo Unblock appveyor
2 parents 53f4bc3 + bd4f381 commit 547c12b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/ci/init_repo.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ if [ ! -f "$cache_valid_file" ]; then
4141
rm -rf "$CACHE_DIR"
4242
mkdir "$CACHE_DIR"
4343
else
44+
set +o errexit
4445
stat_lines=$(cd "$cache_src_dir" && git status --porcelain | wc -l)
45-
stat_ec=$(cd "$cache_src_dir" && git status >/dev/null 2>&1 && echo $?)
46+
stat_ec=$(cd "$cache_src_dir" && git status >/dev/null 2>&1; echo $?)
47+
set -o errexit
4648
if [ ! -d "$cache_src_dir/.git" -o $stat_lines != 0 -o $stat_ec != 0 ]; then
4749
# Something is badly wrong - the cache valid file is here, but something
4850
# about the git repo is fishy. Nuke it all, just in case

0 commit comments

Comments
 (0)