diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-22 12:10:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-22 12:10:30 -0400 |
| commit | 2da3e3f70922fb3855deaf4e995b5eb857deb5e5 (patch) | |
| tree | 8ef2b4e63587c73e9d704befecae1237f3e85ecf | |
| parent | af3ab180bf89c59402e90760ec02cc91ddf94573 (diff) | |
| parent | 4013e50cb732bfb3e2706baef5cd7aba8d16d8c4 (diff) | |
| download | tor-2da3e3f70922fb3855deaf4e995b5eb857deb5e5.tar.gz tor-2da3e3f70922fb3855deaf4e995b5eb857deb5e5.zip | |
Merge branch 'maint-0.4.0' into release-0.4.0
| -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 abc5cbeb38..07ba574f4e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -102,6 +102,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. |