aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorGravatar Gary Wang <git@blumia.net> 2024-11-13 20:23:05 +0800
committerGravatar Chris Xiong <chirs241097@gmail.com> 2024-11-13 22:23:31 -0500
commit65fc828397cbd00062f0777ca7aefd6b051fb764 (patch)
tree380fe63ded5dd8784def8236c7d61411f5ab5d69 /.github
parentcf144e36098eb624a0b62c48c37f6f3f73d5be06 (diff)
downloaddeduper-65fc828397cbd00062f0777ca7aefd6b051fb764.tar.xz
CI: switch to Qt 6 buildHEADmaster
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/windows-msys2.yml18
1 files changed, 9 insertions, 9 deletions
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/*