diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-22 12:10:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-22 12:10:08 -0400 |
| commit | 21c3488af714ade6f07251194165d92f77f06c31 (patch) | |
| tree | dac21871cc9b9c9e9e1f9a96a7cc84d96936fb0f | |
| parent | bed439013394dc083c525d91129868071619c39b (diff) | |
| parent | b186418792fe1283855acf2f143661b7c6d7254e (diff) | |
| download | tor-21c3488af714ade6f07251194165d92f77f06c31.tar.gz tor-21c3488af714ade6f07251194165d92f77f06c31.zip | |
Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5
| -rw-r--r-- | .appveyor.yml | 12 | ||||
| -rw-r--r-- | changes/bug31884 | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 12713b7518..184b1f0289 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 0000000000..ddb6c50d74 --- /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. |