From 0468e0e43a1f1a8fb9676cffe5a71af53ec6c16a Mon Sep 17 00:00:00 2001 From: selsta Date: Wed, 6 Apr 2022 04:43:13 +0200 Subject: [PATCH 1/2] workflows: deploy on windows --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7701c5c4..5a6fc870 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 - name: build run: DEV_MODE=ON make release-win64 -j2 + - name: deploy + run: make deploy + working-directory: build/release - name: test qml run: build/release/bin/monero-wallet-gui --test-qml From 85dff323c8c3b376d4bc24b474c8fbaeba0acce8 Mon Sep 17 00:00:00 2001 From: selsta Date: Wed, 6 Apr 2022 04:43:57 +0200 Subject: [PATCH 2/2] cmake: bump windows deploy lib versions --- cmake/Deploy.cmake | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cmake/Deploy.cmake b/cmake/Deploy.cmake index 084db834..531e9d31 100644 --- a/cmake/Deploy.cmake +++ b/cmake/Deploy.cmake @@ -74,19 +74,19 @@ if(APPLE OR (WIN32 AND NOT STATIC)) ) if(CMAKE_BUILD_TYPE STREQUAL "Debug") list(APPEND WIN_DEPLOY_DLLS - libicudtd68.dll - libicuind68.dll - libicuiod68.dll - libicutud68.dll - libicuucd68.dll + libicudtd69.dll + libicuind69.dll + libicuiod69.dll + libicutud69.dll + libicuucd69.dll ) else() # assume release list(APPEND WIN_DEPLOY_DLLS - libicudt68.dll - libicuin68.dll - libicuio68.dll - libicutu68.dll - libicuuc68.dll + libicudt69.dll + libicuin69.dll + libicuio69.dll + libicutu69.dll + libicuuc69.dll ) endif() list(TRANSFORM WIN_DEPLOY_DLLS PREPEND "$ENV{MSYSTEM_PREFIX}/bin/")