From 22f7ebfbe47545b6e8dcd0795cccbb5489f7e4da Mon Sep 17 00:00:00 2001 From: Gary Wang Date: Sun, 21 Jul 2024 15:56:42 +0800 Subject: [PATCH] CI: no longer use static qt build --- .github/workflows/windows-msys2.yml | 8 ++++---- quick/CMakeLists.txt | 20 ++++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml index cd7c232..d30e04d 100644 --- a/.github/workflows/windows-msys2.yml +++ b/.github/workflows/windows-msys2.yml @@ -16,20 +16,20 @@ jobs: pacboy: >- toolchain:p ninja:p cmake:p extra-cmake-modules:p jasper:p icoutils:p - qt6-static:p libopenmpt:p portaudio:p + qt6:p libopenmpt:p portaudio:p - name: Build pineapple-tracker-player run: | mkdir build && cd build - cmake .. -DCMAKE_PREFIX_PATH="${MINGW_PREFIX}/qt6-static" -DCMAKE_INSTALL_PREFIX="package_workspace" -G Ninja + cmake .. -DCMAKE_INSTALL_PREFIX="package_workspace" -G Ninja cmake --build . -j cmake --build . --target install/strip - name: Prepare for package run: | - rm -rf /c/Windows/SYSTEM32/libssl-* || true - rm -rf /c/Windows/SYSTEM32/libcrypto-* || true cd build/package_workspace/bin ldd ./pineapple-tracker-player-quick.exe > deps-trackerplayer.txt bash -c 'while read -r line; do path=$(cut -d" " -f3 <<<$line); cp -v $path ./; done <<<$(grep ".*mingw.*bin" deps-trackerplayer.txt); exit 0' + windeployqt6 --no-translations --no-opengl-sw --no-system-d3d-compiler ./pineapple-tracker-player-quick.exe + windeployqt6 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler ./pineapple-tracker-player.exe # rm deps-trackerplayer.txt # done cd ../../ diff --git a/quick/CMakeLists.txt b/quick/CMakeLists.txt index 0382008..fc60050 100644 --- a/quick/CMakeLists.txt +++ b/quick/CMakeLists.txt @@ -47,14 +47,18 @@ QML_FILES components/InstrumentItem.qml ) -qt_add_translations(pineapple-tracker-player-quick -TS_FILES - translations/pineapple-tracker-player.ts - translations/pineapple-tracker-player_nl.ts - translations/pineapple-tracker-player_pl.ts - translations/pineapple-tracker-player_tr.ts - translations/pineapple-tracker-player_zh_CN.ts -) +# https://forum.qt.io/topic/155823/cmake-does-not-work-with-qt-6-7-0 +# https://bugreports.qt.io/browse/QTBUG-126167 +if (Qt6LinguistTools_VERSION VERSION_LESS 6.7.0 OR Qt6LinguistTools_VERSION VERSION_GREATER 6.7.2) + qt_add_translations(pineapple-tracker-player-quick + TS_FILES + translations/pineapple-tracker-player.ts + translations/pineapple-tracker-player_nl.ts + translations/pineapple-tracker-player_pl.ts + translations/pineapple-tracker-player_tr.ts + translations/pineapple-tracker-player_zh_CN.ts + ) +endif() qt_add_resources(pineapple-tracker-player-quick resources.qrc PREFIX "/icons"