Skip to content

Commit c969c33

Browse files
authored
fixed #12034 - release-windows.yml: specify proper openssl tool (#5522)
1 parent 47d2c0f commit c969c33

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/release-windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
with:
6868
version: ${{ env.QT_VERSION }}
6969
modules: 'qtcharts'
70-
tools: 'tools_openssl_x64,qt.tools.openssl.win_x64'
70+
tools: 'tools_opensslv3_x64'
7171
cache: true
7272

7373
- name: Create .qm
@@ -121,8 +121,8 @@ jobs:
121121
xcopy /s gui\help win_installer\files\help || exit /b !errorlevel!
122122
del win_installer\files\translations\*.qm || exit /b !errorlevel!
123123
move gui\*.qm win_installer\files\translations || exit /b !errorlevel!
124-
:: copy libcrypto-1_1-x64.dll and libssl-1_1-x64.dll
125-
copy %RUNNER_WORKSPACE%\Qt\Tools\OpenSSL\Win_x64\bin\lib*.dll win_installer\files || exit /b !errorlevel!
124+
:: copy libcrypto-3-x64.dll and libssl-3-x64.dll
125+
copy %RUNNER_WORKSPACE%\Qt\Tools\OpenSSLv3\Win_x64\bin\lib*.dll win_installer\files || exit /b !errorlevel!
126126
127127
- name: Build Installer
128128
run: |

win_installer/cppcheck.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<File Id='Qt5Chartsdll' Name='Qt5Charts.dll' Source='$(var.QtDllDir)\Qt5Charts.dll' />
4747
<?endif?>
4848
<File Id='Qt5Network.dll' Name='Qt5Network.dll' DiskId='1' Source='$(var.QtDllDir)\Qt5Network.dll' />
49-
<File Id='libcrypto.dll' Name='libcrypto-1_1-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libcrypto-1_1-x64.dll' />
50-
<File Id='libssl.dll' Name='libssl-1_1-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libssl-1_1-x64.dll' />
49+
<File Id='libcrypto.dll' Name='libcrypto-3-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libcrypto-3-x64.dll' />
50+
<File Id='libssl.dll' Name='libssl-3-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libssl-3-x64.dll' />
5151
</Component>
5252
<Directory Id='QtPlatformsFolder' Name='platforms'>
5353
<Component Id='QtPlatforms' DiskId='1' Guid='$(var.qtplatformsGUID)'>

0 commit comments

Comments
 (0)