From 65fc828397cbd00062f0777ca7aefd6b051fb764 Mon Sep 17 00:00:00 2001
From: Gary Wang <git@blumia.net>
Date: Wed, 13 Nov 2024 20:23:05 +0800
Subject: CI: switch to Qt 6 build

---
 .github/workflows/windows-msys2.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml
index f95a244..40e9317 100644
--- a/.github/workflows/windows-msys2.yml
+++ b/.github/workflows/windows-msys2.yml
@@ -1,5 +1,5 @@
 name: Windows MSYS2 Build
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
@@ -8,18 +8,18 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: MINGW64
+          msystem: UCRT64
           update: true
           pacboy: >-
             toolchain:p ninja:p cmake:p
-            qt5:p opencv:p sqlite3:p
+            qt6:p opencv:p sqlite3:p
       - name: Build deduper
         run: |
           mkdir build && cd build
-          cmake .. -G Ninja
+          cmake .. -G Ninja -DQDEDUPER_USE_QT6=ON
           cmake --build . -j
           cd ..
       - name: Prepare for package
@@ -28,13 +28,13 @@ jobs:
           mkdir package_workspace && cd package_workspace
           cp ../build/qdeduper/qdeduper.exe ./
           strip -S ./qdeduper.exe
-          windeployqt -winextras --no-quick-import --no-translations --no-opengl-sw --no-angle --no-system-d3d-compiler ./qdeduper.exe
+          windeployqt6 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler ./qdeduper.exe
           ldd ./qdeduper.exe > deps-qdeduper.txt
-          bash -c 'while read -r line; do path=$(cut -d" " -f3 <<<$line); cp -v $path ./; done <<<$(grep ".*mingw.*bin" deps-qdeduper.txt); exit 0'
+          bash -c 'while read -r line; do path=$(cut -d" " -f3 <<<$line); cp -v $path ./; done <<<$(grep ".*ucrt.*bin" deps-qdeduper.txt); exit 0'
           rm deps-qdeduper.txt
           # done
           cd ../
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
-          name: msys2-mingw-w64-x86_64-windows
+          name: mingw-w64-ucrt-x86_64-windows
           path: package_workspace/*
-- 
cgit v1.2.3