mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-20 10:12:15 +01:00
Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4
This commit is contained in:
commit
48182c147b
@ -9,10 +9,12 @@ environment:
|
||||
- target: i686-w64-mingw32
|
||||
compiler_path: mingw32
|
||||
openssl_path: /c/OpenSSL-Win32
|
||||
mingw_prefix: mingw-w64-i686
|
||||
hardening:
|
||||
- target: x86_64-w64-mingw32
|
||||
compiler_path: mingw64
|
||||
openssl_path: /c/OpenSSL-Win64
|
||||
mingw_prefix: mingw-w64-x86_64
|
||||
hardening: --disable-gcc-hardening
|
||||
|
||||
install:
|
||||
@ -28,7 +30,7 @@ install:
|
||||
{
|
||||
Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
|
||||
}
|
||||
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\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent ${env:mingw_prefix}-zstd ;
|
||||
|
||||
build_script:
|
||||
- ps: >-
|
||||
|
5
changes/tickets_27765_27943
Normal file
5
changes/tickets_27765_27943
Normal 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.
|
Loading…
Reference in New Issue
Block a user