CI: no longer use static qt build

BLumia · Jul 21, 2024 · 22f7ebf · 22f7ebf
1 parent 4edfbf6
commit 22f7ebf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git 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
@@ -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"