This commit is contained in:
parent
47d2c0f619
commit
c969c331ea
|
@ -67,7 +67,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
version: ${{ env.QT_VERSION }}
|
version: ${{ env.QT_VERSION }}
|
||||||
modules: 'qtcharts'
|
modules: 'qtcharts'
|
||||||
tools: 'tools_openssl_x64,qt.tools.openssl.win_x64'
|
tools: 'tools_opensslv3_x64'
|
||||||
cache: true
|
cache: true
|
||||||
|
|
||||||
- name: Create .qm
|
- name: Create .qm
|
||||||
|
@ -121,8 +121,8 @@ jobs:
|
||||||
xcopy /s gui\help win_installer\files\help || exit /b !errorlevel!
|
xcopy /s gui\help win_installer\files\help || exit /b !errorlevel!
|
||||||
del win_installer\files\translations\*.qm || exit /b !errorlevel!
|
del win_installer\files\translations\*.qm || exit /b !errorlevel!
|
||||||
move gui\*.qm win_installer\files\translations || 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 libcrypto-3-x64.dll and libssl-3-x64.dll
|
||||||
copy %RUNNER_WORKSPACE%\Qt\Tools\OpenSSL\Win_x64\bin\lib*.dll win_installer\files || exit /b !errorlevel!
|
copy %RUNNER_WORKSPACE%\Qt\Tools\OpenSSLv3\Win_x64\bin\lib*.dll win_installer\files || exit /b !errorlevel!
|
||||||
|
|
||||||
- name: Build Installer
|
- name: Build Installer
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -46,8 +46,8 @@
|
||||||
<File Id='Qt5Chartsdll' Name='Qt5Charts.dll' Source='$(var.QtDllDir)\Qt5Charts.dll' />
|
<File Id='Qt5Chartsdll' Name='Qt5Charts.dll' Source='$(var.QtDllDir)\Qt5Charts.dll' />
|
||||||
<?endif?>
|
<?endif?>
|
||||||
<File Id='Qt5Network.dll' Name='Qt5Network.dll' DiskId='1' Source='$(var.QtDllDir)\Qt5Network.dll' />
|
<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='libcrypto.dll' Name='libcrypto-3-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libcrypto-3-x64.dll' />
|
||||||
<File Id='libssl.dll' Name='libssl-1_1-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libssl-1_1-x64.dll' />
|
<File Id='libssl.dll' Name='libssl-3-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libssl-3-x64.dll' />
|
||||||
</Component>
|
</Component>
|
||||||
<Directory Id='QtPlatformsFolder' Name='platforms'>
|
<Directory Id='QtPlatformsFolder' Name='platforms'>
|
||||||
<Component Id='QtPlatforms' DiskId='1' Guid='$(var.qtplatformsGUID)'>
|
<Component Id='QtPlatforms' DiskId='1' Guid='$(var.qtplatformsGUID)'>
|
||||||
|
|
Loading…
Reference in New Issue