From 5140e6be2e787cb712fbd9180fb62d076985f290 Mon Sep 17 00:00:00 2001 From: Andrew Rabert Date: Sun, 21 Dec 2025 22:25:11 -0500 Subject: [PATCH] Fix windows build pipelines --- .github/workflows/main.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 558dbfe..f3e73cc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -130,6 +130,8 @@ jobs: cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=output -DCMAKE_MAKE_PROGRAM=ninja.exe -DQTROOT=%Qt6_DIR% -DMPV_INCLUDE_DIR=mpv/include -DMPV_LIBRARY=mpv/libmpv-2.dll -DCHECK_FOR_UPDATES=ON -DUSE_STATIC_MPVQT=ON .. lib /def:mpv\mpv.def /out:mpv\libmpv-2.dll.lib /MACHINE:X64 ninja + mkdir output 2>nul + copy ..\vc_redist.x64.exe output\ ninja windows_package shell: cmd - name: Archive production artifacts @@ -148,9 +150,9 @@ jobs: - name: Install Qt 6 uses: jurplel/install-qt-action@v4 with: - version: "6.8.0" - arch: "win64_msvc2019_64" - modules: "qtwebengine" + version: "6.10.*" + arch: "win64_msvc2022_64" + modules: "qtwebengine qtwebchannel qtpositioning" - name: Install dependencies run: | mkdir build @@ -177,6 +179,8 @@ jobs: cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=output -DCMAKE_MAKE_PROGRAM=ninja.exe -DQTROOT=%Qt6_DIR% -DMPV_INCLUDE_DIR=mpv/include -DMPV_LIBRARY=mpv/libmpv-2.dll -DCHECK_FOR_UPDATES=ON -DUSE_STATIC_MPVQT=ON .. lib /def:mpv\mpv.def /out:mpv\libmpv-2.dll.lib /MACHINE:X64 ninja + mkdir output 2>nul + copy ..\vc_redist.x64.exe output\ ninja windows_package shell: cmd - name: Archive production artifacts @@ -195,9 +199,9 @@ jobs: - name: Install Qt 6 uses: jurplel/install-qt-action@v4 with: - version: "6.8.0" - arch: "win32_msvc2019" - modules: "qtwebengine" + version: "6.10.*" + arch: "win32_msvc2022" + modules: "qtwebengine qtwebchannel qtpositioning" - name: Install dependencies run: | mkdir build @@ -224,6 +228,8 @@ jobs: cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=output -DCMAKE_MAKE_PROGRAM=ninja.exe -DQTROOT=%Qt6_DIR% -DMPV_INCLUDE_DIR=mpv/include -DMPV_LIBRARY=mpv/libmpv-2.dll -DCHECK_FOR_UPDATES=ON -DUSE_STATIC_MPVQT=ON .. lib /def:mpv\mpv.def /out:mpv\libmpv-2.dll.lib /MACHINE:X86 ninja + mkdir output 2>nul + copy ..\vc_redist.x86.exe output\ ninja windows_package shell: cmd - name: Archive production artifacts