From 90e038e7321deefb93b75fc95e6807e2d3482ca6 Mon Sep 17 00:00:00 2001
From: teor <teor@torproject.org>
Date: Wed, 5 Sep 2018 10:17:39 +1000
Subject: [PATCH 1/2] Appveyor: always log the compiler path and version

Implements 27449.
---
 .appveyor.yml       | 2 ++
 changes/ticket27449 | 3 +++
 2 files changed, 5 insertions(+)
 create mode 100644 changes/ticket27449

diff --git a/.appveyor.yml b/.appveyor.yml
index d1d8d7c45b..7cc86004bf 100644
--- 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"
diff --git a/changes/ticket27449 b/changes/ticket27449
new file mode 100644
index 0000000000..2a0984c09c
--- /dev/null
+++ b/changes/ticket27449
@@ -0,0 +1,3 @@
+  o Minor features (continuous integration):
+    - Log the compiler path and version during Appveyor builds.
+      Implements ticket 27449.

From d3a3ac013d44dadf335acc27adcec62abfb69dc8 Mon Sep 17 00:00:00 2001
From: teor <teor@torproject.org>
Date: Wed, 5 Sep 2018 10:44:01 +1000
Subject: [PATCH 2/2] Appveyor: tail config.log and cat test-suite.log after
 failed builds

Also zip the full logs, and upload them as build artifacts.

Implements ticket 27430.
---
 .appveyor.yml       | 13 ++++++++++++-
 changes/ticket27430 |  4 ++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 changes/ticket27430

diff --git a/.appveyor.yml b/.appveyor.yml
index 7cc86004bf..690f93e5b6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -57,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
new file mode 100644
index 0000000000..4e016e91e7
--- /dev/null
+++ 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.