walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fixed #12034 - release-windows.yml: specify proper openssl tool (#5522)

This commit is contained in:
Oliver Stöneberg 2023-10-09 12:15:46 +02:00 committed by GitHub
parent 47d2c0f619
commit c969c331ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/release-windows.yml vendored
View File

@ -67,7 +67,7 @@ jobs:
with:
version: ${{ env.QT_VERSION }}
modules: 'qtcharts'
tools: 'tools_openssl_x64,qt.tools.openssl.win_x64'
tools: 'tools_opensslv3_x64'
cache: true
- name: Create .qm
@ -121,8 +121,8 @@ jobs:
xcopy /s gui\help win_installer\files\help || exit /b !errorlevel!
del win_installer\files\translations\*.qm || exit /b !errorlevel!
move gui\*.qm win_installer\files\translations || exit /b !errorlevel!
:: copy libcrypto-1_1-x64.dll and libssl-1_1-x64.dll
copy %RUNNER_WORKSPACE%\Qt\Tools\OpenSSL\Win_x64\bin\lib*.dll win_installer\files || exit /b !errorlevel!
:: copy libcrypto-3-x64.dll and libssl-3-x64.dll
copy %RUNNER_WORKSPACE%\Qt\Tools\OpenSSLv3\Win_x64\bin\lib*.dll win_installer\files || exit /b !errorlevel!
- name: Build Installer
run: |

4
win_installer/cppcheck.wxs
View File

@ -46,8 +46,8 @@
<File Id='Qt5Chartsdll' Name='Qt5Charts.dll' Source='$(var.QtDllDir)\Qt5Charts.dll' />
<?endif?>
<File Id='Qt5Network.dll' Name='Qt5Network.dll' DiskId='1' Source='$(var.QtDllDir)\Qt5Network.dll' />
<File Id='libcrypto.dll' Name='libcrypto-1_1-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libcrypto-1_1-x64.dll' />
<File Id='libssl.dll' Name='libssl-1_1-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libssl-1_1-x64.dll' />
<File Id='libcrypto.dll' Name='libcrypto-3-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libcrypto-3-x64.dll' />
<File Id='libssl.dll' Name='libssl-3-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libssl-3-x64.dll' />
</Component>
<Directory Id='QtPlatformsFolder' Name='platforms'>
<Component Id='QtPlatforms' DiskId='1' Guid='$(var.qtplatformsGUID)'>