[tor-commits] [tor/maint-0.3.4] Appveyor: remove incorrect OpenSSL path

[nickm@xxxxxxxxxxxxxx]

commit 540c833f20934ca0219579b96fae87c65bc1534e
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Thu Nov 15 14:32:53 2018 +1000

    Appveyor: remove incorrect OpenSSL path
    
    Fixes 28399 on 0.3.4.1-alpha.
---
 .appveyor.yml    | 4 +---
 changes/bug28399 | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 4069a5396..fdf831686 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,12 +8,10 @@ environment:
   matrix:
   - 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
 
@@ -45,7 +43,7 @@ build_script:
             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} ${env:hardening}"
+            Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings ${env:hardening}"
             Execute-Bash "V=1 make -j2"
             Execute-Bash "V=1 make -j2 install"
      }
diff --git a/changes/bug28399 b/changes/bug28399
new file mode 100644
index 000000000..9096db70b
--- /dev/null
+++ b/changes/bug28399
@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+    - Stop using an external OpenSSL install, and stop installing MSYS2
+      packages, when building using mingw on Appveyor Windows CI.
+      Fixes bug 28399; bugfix on 0.3.4.1-alpha.



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits