nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4

Browse Source
This commit is contained in:
Nick Mathewson 2018-10-10 14:27:24 -04:00
commit 48182c147b
2 changed files with 81 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
.appveyor.yml
View File

@ -1,74 +1,76 @@
version: 1.0.{build} version: 1.0.{build}
clone_depth: 50 clone_depth: 50
environment: environment:
compiler: mingw compiler: mingw
matrix: matrix:
- target: i686-w64-mingw32 - target: i686-w64-mingw32
compiler_path: mingw32 compiler_path: mingw32
openssl_path: /c/OpenSSL-Win32 openssl_path: /c/OpenSSL-Win32
hardening: mingw_prefix: mingw-w64-i686
- target: x86_64-w64-mingw32 hardening:
compiler_path: mingw64 - target: x86_64-w64-mingw32
openssl_path: /c/OpenSSL-Win64 compiler_path: mingw64
hardening: --disable-gcc-hardening openssl_path: /c/OpenSSL-Win64
mingw_prefix: mingw-w64-x86_64
install: hardening: --disable-gcc-hardening
- ps: >-
Function Execute-Command ($commandPath) install:
{ - ps: >-
& $commandPath $args 2>&1 Function Execute-Command ($commandPath)
if ( $LastExitCode -ne 0 ) { {
$host.SetShouldExit( $LastExitCode ) & $commandPath $args 2>&1
} if ( $LastExitCode -ne 0 ) {
} $host.SetShouldExit( $LastExitCode )
Function Execute-Bash () }
{ }
Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args Function Execute-Bash ()
} {
Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent mingw-w64-i686-libevent mingw-w64-x86_64-libevent mingw-w64-i686-openssl mingw-w64-x86_64-openssl mingw-w64-i686-zstd mingw-w64-x86_64-zstd Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
}
build_script: Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent ${env:mingw_prefix}-zstd ;
- ps: >-
if ($env:compiler -eq "mingw") { build_script:
$oldpath = ${env:Path} -split ';' - ps: >-
$buildpath = @("C:\msys64\${env:compiler_path}\bin", "C:\msys64\usr\bin") + $oldpath if ($env:compiler -eq "mingw") {
$env:Path = @($buildpath) -join ';' $oldpath = ${env:Path} -split ';'
$env:build = @("${env:APPVEYOR_BUILD_FOLDER}", $env:target) -join '\' $buildpath = @("C:\msys64\${env:compiler_path}\bin", "C:\msys64\usr\bin") + $oldpath
Set-Location "${env:APPVEYOR_BUILD_FOLDER}" $env:Path = @($buildpath) -join ';'
Execute-Bash 'autoreconf -i' $env:build = @("${env:APPVEYOR_BUILD_FOLDER}", $env:target) -join '\'
mkdir "${env:build}" Set-Location "${env:APPVEYOR_BUILD_FOLDER}"
Set-Location "${env:build}" Execute-Bash 'autoreconf -i'
Execute-Bash "which ${env:target}-gcc" mkdir "${env:build}"
Execute-Bash "${env:target}-gcc --version" Set-Location "${env:build}"
Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}" Execute-Bash "which ${env:target}-gcc"
Execute-Bash "V=1 make -j2" Execute-Bash "${env:target}-gcc --version"
Execute-Bash "V=1 make -j2 install" Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}"
} Execute-Bash "V=1 make -j2"
Execute-Bash "V=1 make -j2 install"
test_script: }
- ps: >-
if ($env:compiler -eq "mingw") { test_script:
$oldpath = ${env:Path} -split ';' - ps: >-
$buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath if ($env:compiler -eq "mingw") {
$env:Path = $buildpath -join ';' $oldpath = ${env:Path} -split ';'
Set-Location "${env:build}" $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath
Execute-Bash "VERBOSE=1 make -j2 check" $env:Path = $buildpath -join ';'
} Set-Location "${env:build}"
Execute-Bash "VERBOSE=1 make -j2 check"
on_failure: }
- ps: >-
if ($env:compiler -eq "mingw") { on_failure:
$oldpath = ${env:Path} -split ';' - ps: >-
$buildpath = @("C:\msys64\usr\bin") + $oldpath if ($env:compiler -eq "mingw") {
$env:Path = @($buildpath) -join ';' $oldpath = ${env:Path} -split ';'
Set-Location "${env:build}" $buildpath = @("C:\msys64\usr\bin") + $oldpath
Execute-Bash "7z a logs.zip config.log || true" $env:Path = @($buildpath) -join ';'
Execute-Bash "7z a logs.zip test-suite.log || true" Set-Location "${env:build}"
Execute-Bash "appveyor PushArtifact logs.zip || true" Execute-Bash "7z a logs.zip config.log || true"
Execute-Bash "tail -1000 config.log || true" Execute-Bash "7z a logs.zip test-suite.log || true"
Execute-Bash "cat test-suite.log || true" Execute-Bash "appveyor PushArtifact logs.zip || true"
} Execute-Bash "tail -1000 config.log || true"
- cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure 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

5
changes/tickets_27765_27943 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (CI, appveyor):
- Only install the necessary mingw packages during our appveyor
builds. This change makes the build a little faster, and prevents a
conflict with a preinstalled mingw openssl that appveyor now ships.
Fixes bugs 27943 and 27765; bugfix on 0.3.4.2-alpha.