commit b186418792fe1283855acf2f143661b7c6d7254e Author: teor teor@torproject.org Date: Mon Sep 30 15:14:21 2019 +1000
Appveyor: Avoid spurious errors in Appveyor CI builds
When Appveyor fails before the install step, some of the finish step's functions were not defined.
Fixes bug 31884; bugfix on 0.3.4.2-alpha. --- .appveyor.yml | 12 ++++++++++++ changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)
diff --git a/.appveyor.yml b/.appveyor.yml index 9913bf3bd..54456aa25 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -100,6 +100,18 @@ test_script:
on_finish: - ps: >- + <# if we failed before install:, these functions won't be defined #> + Function Execute-Command ($commandPath) + { + & $commandPath $args 2>&1 + if ( $LastExitCode -ne 0 ) { + $host.SetShouldExit( $LastExitCode ) + } + } + Function Execute-Bash () + { + Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args + } if ($env:compiler -eq "mingw") { <# use the MSYS2 user binaries to archive failures #> $oldpath = ${env:Path} -split ';' diff --git a/changes/bug31884 b/changes/bug31884 new file mode 100644 index 000000000..ddb6c50d7 --- /dev/null +++ b/changes/bug31884 @@ -0,0 +1,3 @@ + o Minor bugfixes (Appveyor CI): + - Avoid spurious errors when Appveyor CI fails before the install step. + Fixes bug 31884; bugfix on 0.3.4.2-alpha.