From c6e7b5d4ee8357db4127a522f583ec13590e3c8e Mon Sep 17 00:00:00 2001 From: Gary Wang Date: Wed, 20 Dec 2023 00:47:07 +0800 Subject: chore(CI): switch to Qt 6 --- .github/workflows/windows-msys2.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml index 56f12e0..3111d36 100644 --- a/.github/workflows/windows-msys2.yml +++ b/.github/workflows/windows-msys2.yml @@ -8,7 +8,7 @@ jobs: run: shell: msys2 {0} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: true - uses: msys2/setup-msys2@v2 @@ -17,7 +17,7 @@ jobs: update: true install: >- git mingw-w64-x86_64-toolchain mingw-w64-x86_64-ninja mingw-w64-x86_64-cmake tree - mingw-w64-x86_64-qt5 + mingw-w64-x86_64-qt6 mingw-w64-x86_64-glfw mingw-w64-x86_64-glew mingw-w64-x86_64-freetype mingw-w64-x86_64-devil mingw-w64-x86_64-freeglut mingw-w64-x86_64-zlib mingw-w64-x86_64-rtmidi - name: Build fluidsynth-sans-glib id: build-fluidsynth-sans-glib @@ -37,7 +37,7 @@ jobs: - name: Build qmidiplayer run: | mkdir build && cd build - cmake .. -G Ninja + cmake .. -G Ninja -DUSE_QT6=ON -DCMAKE_BUILD_TYPE=Release cmake --build . tree cd .. @@ -46,16 +46,18 @@ jobs: run: | mkdir package_workspace && cd package_workspace cp ../build/qmidiplayer-desktop/qmidiplayer.exe ./ - windeployqt -winextras --no-quick-import --no-translations --no-opengl-sw --no-angle --no-system-d3d-compiler ./qmidiplayer.exe + windeployqt6 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler ./qmidiplayer.exe # standalone visualization renderer cp ../build/visualization/renderer/qmpvisrender.exe ./ + # copy translations + mkdir translations + cp ../build/qmidiplayer-desktop/*.qm ./translations/ # copy plugins mkdir plugins cp ../build/midifmt-plugin/libmidifmt-plugin.dll ./plugins/ cp ../build/simple-visualization/libsimple-visualization.dll ./plugins/ cp ../build/visualization/libvisualization.dll ./plugins/ cp ../build/sample-plugin/libsampleplugin.dll ./plugins/ - cp ../build/windows-extra/libwindowsextra.dll ./plugins/ # license file cp ../COPYING ./ # dependencies @@ -72,7 +74,7 @@ jobs: run: | cd package_workspace cp $MINGW_PREFIX/bin/libglib-2.0-*.dll ./ - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: msys2-mingw-w64-x86_64-windows path: package_workspace/* -- cgit v1.2.3