From 78d58b1cff94c135185c0f203145f226b40c05f0 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Tue, 1 Dec 2020 21:39:44 +0800
Subject: [PATCH] Fix win workflow (#1580)

* copy OpenSSL

* use openssul.utils
---
 .github/workflows/ci-win.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml
index dc5b2f8f..61f0a4ec 100644
--- a/.github/workflows/ci-win.yml
+++ b/.github/workflows/ci-win.yml
@@ -24,7 +24,7 @@ jobs:
           - {
             name: "Build On Win64",
             arch: win64_msvc2017_64,
-            platform: amd64
+            platform: x64
           }
           - {
             name: "Build On Win32",
@@ -52,12 +52,19 @@ jobs:
           target: desktop
           arch: ${{matrix.config.arch}}
           modules: qtwebchannel qtwebengine qtsvg qtlocation qttools qttranslations
+          tools: tools_openssl_${{matrix.config.platform}},1.1.1-4,qt.tools.openssl.win_${{matrix.config.platform}}
 
       - name: Create Build Dir
         shell: bash
         run: mkdir build
         working-directory: ${{runner.workspace}}
 
+      - name: Clone OpenSSL
+        shell: bash
+        run: |
+          git clone https://github.com/tamlok/openssl-utils.git openssl-utils.git --depth=1
+        working-directory: ${{runner.workspace}}/build
+
       - name: Configure and Build Project
         shell: cmd
         run: |
@@ -70,12 +77,17 @@ jobs:
         shell: cmd
         run: |
           mkdir "%DISTRIB_PATH%"
-          windeployqt.exe --dir "%DISTRIB_PATH%" .\src\release\vnote.exe
           call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{matrix.config.platform}}
+          windeployqt.exe --dir "%DISTRIB_PATH%" .\src\release\vnote.exe
           copy .\src\release\vnote.exe "%DISTRIB_PATH%\vnote.exe"
           copy .\src\release\extra.rcc "%DISTRIB_PATH%\extra.rcc"
           copy .\libs\vtextedit\src\libs\syntax-highlighting\release\KSyntaxHighlighting.dll "%DISTRIB_PATH%\KSyntaxHighlighting.dll"
           copy .\libs\vtextedit\src\editor\release\VTextEdit.dll "%DISTRIB_PATH%\VTextEdit.dll"
+          rem set qt_dir=%Qt5_Dir:/=\%
+          rem for %%I in ("%qt_dir%\..\..") do set "qt_topdir=%%~fI"
+          rem set openssl_dir=%qt_topdir%\Tools\OpenSSL\Win_${{matrix.config.platform}}\bin
+          set openssl_dir=openssl-utils.git\1.1.1g\Win_${{matrix.config.platform}}
+          copy %openssl_dir%\lib*.dll "%DISTRIB_PATH%\"
           copy "%GITHUB_WORKSPACE%\README.md" "%DISTRIB_PATH%\README.md"
           copy "%GITHUB_WORKSPACE%\COPYING.LESSER" "%DISTRIB_PATH%\COPYING.LESSER"
           echo %GITHUB_SHA% > "%DISTRIB_PATH%\commit"