Merge branch 'maint-0.3.4'

This commit is contained in:
Nick Mathewson 2018-09-05 10:01:31 -04:00
commit 75da2045c5
3 changed files with 21 additions and 1 deletions

View File

@ -39,6 +39,8 @@ build_script:
Execute-Bash 'autoreconf -i' Execute-Bash 'autoreconf -i'
mkdir "${env:build}" mkdir "${env:build}"
Set-Location "${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 "../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"
Execute-Bash "V=1 make -j2 install" Execute-Bash "V=1 make -j2 install"
@ -55,5 +57,16 @@ test_script:
} }
on_failure: 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 - cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure

4
changes/ticket27430 Normal file
View File

@ -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.

3
changes/ticket27449 Normal file
View File

@ -0,0 +1,3 @@
o Minor features (continuous integration):
- Log the compiler path and version during Appveyor builds.
Implements ticket 27449.