tor

commit 75da2045c552d1855c6227d732420f6417a15f6e
parent 2f618094d25db35436a1e6962f4f8393d6470a08
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  5 Sep 2018 10:01:31 -0400

Merge branch 'maint-0.3.4'

Diffstat:
M
.appveyor.yml
 | 
15
++++++++++++++-
A
changes/ticket27430
 | 
4
++++
A
changes/ticket27449
 | 
3
+++

3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -39,6 +39,8 @@ build_script:
             Execute-Bash 'autoreconf -i'
             mkdir "${env:build}"
             Set-Location "${env:build}"
+            Execute-Bash "which ${env:target}-gcc"
+            Execute-Bash "${env:target}-gcc --version"
             Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path}"
             Execute-Bash "V=1 make -j2"
             Execute-Bash "V=1 make -j2 install"
@@ -55,5 +57,16 @@ test_script:
     }
 
 on_failure:
+- ps: >-
+    if ($env:compiler -eq "mingw") {
+            $oldpath = ${env:Path} -split ';'
+            $buildpath = @("C:\msys64\usr\bin") + $oldpath
+            $env:Path = @($buildpath) -join ';'
+            Set-Location "${env:build}"
+            Execute-Bash "7z a logs.zip config.log || true"
+            Execute-Bash "7z a logs.zip test-suite.log || true"
+            Execute-Bash "appveyor PushArtifact logs.zip || true"
+            Execute-Bash "tail -1000 config.log || true"
+            Execute-Bash "cat test-suite.log || true"
+    }
 - cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure
-
diff --git a/changes/ticket27430 b/changes/ticket27430
@@ -0,0 +1,4 @@
+  o Minor features (continuous integration):
+    - Show config.log and test-suite.log after failed Appveyor builds.
+      Also upload the zipped full logs as a build artifact.
+      Implements ticket 27430.
diff --git a/changes/ticket27449 b/changes/ticket27449
@@ -0,0 +1,3 @@
+  o Minor features (continuous integration):
+    - Log the compiler path and version during Appveyor builds.
+      Implements ticket 27449.