Skip to content

Commit 1b7fd85

Browse files
committed
Update OpenSSL version on Windows
1 parent 609b537 commit 1b7fd85

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
- name: Download Tools
1919
run: python scripts\download.py
2020
- name: Download OpenSSL
21-
run: choco install -y openssl.light --version=1.1.1.20181020 --x86 --params "/InstallDir:C:\OpenSSL"
21+
run: choco install -y openssl --version=1.1.1.2100 --x86
2222
- name: Build MSI Package
2323
id: build
2424
shell: cmd
2525
run: |
26-
set QTDIR=%Qt5_DIR%
27-
set OPENSSL=C:\OpenSSL
26+
set "QTDIR=%Qt5_DIR%"
27+
set "OPENSSL=C:\Program Files (x86)\OpenSSL-Win32"
2828
set PATH=%PATH%;C:\Program Files (x86)\WiX Toolset v3.11\bin
2929
call scripts\windows\packages\msi\build.msi.bat || exit
3030
set /p VERSION=<VERSION
@@ -55,13 +55,13 @@ jobs:
5555
- name: Download Tools
5656
run: python scripts\download.py
5757
- name: Download OpenSSL
58-
run: choco install -y openssl.light --version=1.1.1.20181020 --x86 --params "/InstallDir:C:\OpenSSL"
58+
run: choco install -y openssl --version=1.1.1.2100 --x86
5959
- name: Build ZIP Package
6060
id: build
6161
shell: cmd
6262
run: |
63-
set QTDIR=%Qt5_DIR%
64-
set OPENSSL=C:\OpenSSL
63+
set "QTDIR=%Qt5_DIR%"
64+
set "OPENSSL=C:\Program Files (x86)\OpenSSL-Win32"
6565
call "scripts\windows\packages\zip\build.zip.bat" || exit
6666
set /p VERSION=<VERSION
6767
echo VERSION=%VERSION%>>%GITHUB_ENV%

scripts/windows/packages/msi/build.msi.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cmake "%~dp0\..\..\..\.." ^
1111
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=. ^
1212
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=. ^
1313
-DCMAKE_PREFIX_PATH="%QTDIR%" ^
14-
-DOPENSSL_ROOT_DIR=%OPENSSL%
14+
-DOPENSSL_ROOT_DIR="%OPENSSL%"
1515
cmake --build build --config Release || exit /b
1616

1717
rem Package

scripts/windows/packages/zip/build.zip.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cmake "%~dp0\..\..\..\.." ^
1010
-B build ^
1111
-DCMAKE_BUILD_TYPE=Release ^
1212
-DCMAKE_PREFIX_PATH="%QTDIR%" ^
13-
-DOPENSSL_ROOT_DIR=%OPENSSL% ^
13+
-DOPENSSL_ROOT_DIR="%OPENSSL%" ^
1414
-DPORTABLE=ON
1515
cmake --build build --config Release || exit /b
1616
cmake --install build --prefix "%FOLDER%"

0 commit comments

Comments
 (0)