From 67cffbb69e5069e02d350321642592c5d00c01f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Sun, 20 Jul 2025 18:30:25 +0200 Subject: [PATCH] fix windows build workflow --- .github/workflows/Build.yml | 15 +++++++-------- .github/workflows/Release_tag_stable.yml | 15 +++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index d9bf247..8eba3d8 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -94,16 +94,16 @@ jobs: - uses: msys2/setup-msys2@v2 - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: - version: '6.2.0' - arch: 'win64_mingw81' + version: '6.2.4' + arch: 'win64_mingw' - name: Download libusb run: | curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.25/libusb-1.0.25.7z 7z x libusb.7z -r -olibusb - Xcopy /E /I /Y libusb\include ..\Qt\6.2.0\mingw81_64\include + Xcopy /E /I /Y libusb\include %QT_ROOT_DIR%\include Xcopy /E /I /Y libusb\MinGW64\static\libusb-1.0.a Software\PC_Application\LibreVNA-GUI shell: cmd @@ -134,10 +134,9 @@ jobs: cd Software/PC_Application/LibreVNA-GUI/release del *.o *.cpp windeployqt.exe . - copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libwinpthread-1.dll . - copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libgcc_s_seh-1.dll . - copy "..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libstdc++-6.dll" . - copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\Qt6OpenGL.dll . + copy %QT_ROOT_DIR%\bin\libwinpthread-1.dll . + copy %QT_ROOT_DIR%\bin\libgcc_s_seh-1.dll . + copy %QT_ROOT_DIR%\bin\Qt6OpenGL.dll . shell: cmd - name: Upload diff --git a/.github/workflows/Release_tag_stable.yml b/.github/workflows/Release_tag_stable.yml index 1412eb0..f92179c 100644 --- a/.github/workflows/Release_tag_stable.yml +++ b/.github/workflows/Release_tag_stable.yml @@ -110,16 +110,16 @@ jobs: - uses: msys2/setup-msys2@v2 - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: - version: '6.2.0' - arch: 'win64_mingw81' + version: '6.2.4' + arch: 'win64_mingw' - name: Download libusb run: | curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.25/libusb-1.0.25.7z 7z x libusb.7z -r -olibusb - Xcopy /E /I /Y libusb\include ..\Qt\6.2.0\mingw81_64\include + Xcopy /E /I /Y libusb\include %QT_ROOT_DIR%\include Xcopy /E /I /Y libusb\MinGW64\static\libusb-1.0.a Software\PC_Application\LibreVNA-GUI shell: cmd @@ -145,10 +145,9 @@ jobs: cd Software/PC_Application/LibreVNA-GUI/release del *.o *.cpp windeployqt.exe . - copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libwinpthread-1.dll . - copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libgcc_s_seh-1.dll . - copy "..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libstdc++-6.dll" . - copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\Qt6OpenGL.dll . + copy %QT_ROOT_DIR%\bin\libwinpthread-1.dll . + copy %QT_ROOT_DIR%\bin\libgcc_s_seh-1.dll . + copy %QT_ROOT_DIR%\bin\Qt6OpenGL.dll . shell: cmd - name: Zip app