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

danmar · Oct 9, 2023 · 47e14dd · 47e14dd
1 parent 9d0e32f
commit 47e14dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml
@@ -68,7 +68,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
@@ -122,8 +122,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: |

diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
@@ -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)'>