Merge pull request #3879

85dff32 cmake: bump windows deploy lib versions (selsta)
0468e0e workflows: deploy on windows (selsta)
This commit is contained in:
luigi1111 2022-04-19 22:30:59 -05:00
commit b31cc36de2
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 13 additions and 10 deletions

View file

@ -55,6 +55,9 @@ jobs:
install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt
- name: build - name: build
run: DEV_MODE=ON make release-win64 -j2 run: DEV_MODE=ON make release-win64 -j2
- name: deploy
run: make deploy
working-directory: build/release
- name: test qml - name: test qml
run: build/release/bin/monero-wallet-gui --test-qml run: build/release/bin/monero-wallet-gui --test-qml

View file

@ -74,19 +74,19 @@ if(APPLE OR (WIN32 AND NOT STATIC))
) )
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
list(APPEND WIN_DEPLOY_DLLS list(APPEND WIN_DEPLOY_DLLS
libicudtd68.dll libicudtd69.dll
libicuind68.dll libicuind69.dll
libicuiod68.dll libicuiod69.dll
libicutud68.dll libicutud69.dll
libicuucd68.dll libicuucd69.dll
) )
else() # assume release else() # assume release
list(APPEND WIN_DEPLOY_DLLS list(APPEND WIN_DEPLOY_DLLS
libicudt68.dll libicudt69.dll
libicuin68.dll libicuin69.dll
libicuio68.dll libicuio69.dll
libicutu68.dll libicutu69.dll
libicuuc68.dll libicuuc69.dll
) )
endif() endif()
list(TRANSFORM WIN_DEPLOY_DLLS PREPEND "$ENV{MSYSTEM_PREFIX}/bin/") list(TRANSFORM WIN_DEPLOY_DLLS PREPEND "$ENV{MSYSTEM_PREFIX}/bin/")