summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-11 12:56:08 +1000
committerteor <teor@torproject.org>2019-11-11 13:19:15 +1000
commit2abff832ddccbd8c32778cf4dba73729666b83d9 (patch)
tree30b234c7a23ac35a6176e4bc42e4520efeb3a3d8
parent1bde356bf645f3c3d3b0a6e70c03e2baf9f89d26 (diff)
downloadtor-2abff832ddccbd8c32778cf4dba73729666b83d9.tar.gz
tor-2abff832ddccbd8c32778cf4dba73729666b83d9.zip
Appveyor: Install OpenSSL to resolve a header/library mismatch
Install the mingw OpenSSL package in Appveyor. This makes sure that the OpenSSL headers and libraries match in Tor's Appveyor builds. (This bug was triggered by an Appveyor image update.) Fixes bug 32449; bugfix on 0.3.5.6-rc.
-rw-r--r--.appveyor.yml2
-rw-r--r--changes/bug324495
2 files changed, 6 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index f722478e15..818e074a4e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -62,7 +62,7 @@ install:
#
# Use pacman --debug to show package downloads and install locations
#>
- Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
+ Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
build_script:
- ps: >-
diff --git a/changes/bug32449 b/changes/bug32449
new file mode 100644
index 0000000000..213d8a1014
--- /dev/null
+++ b/changes/bug32449
@@ -0,0 +1,5 @@
+ o Minor bugfixes (CI, appveyor):
+ - Install the mingw OpenSSL package in Appveyor. This makes sure that
+ the OpenSSL headers and libraries match in Tor's Appveyor builds.
+ (This bug was triggered by an Appveyor image update.)
+ Fixes bug 32449; bugfix on 0.3.5.6-rc.