jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2025-12-06 07:12:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix windows build workflow

Browse source
This commit is contained in:
Jan Käberich 2025-07-20 18:30:25 +02:00
parent 2f256117db
commit 67cffbb69e
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.github/workflows/Build.yml vendored
View file

@ -94,16 +94,16 @@ jobs:
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v4
with: with:
version: '6.2.0' version: '6.2.4'
arch: 'win64_mingw81' arch: 'win64_mingw'
- name: Download libusb - name: Download libusb
run: | run: |
curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.25/libusb-1.0.25.7z 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 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 Xcopy /E /I /Y libusb\MinGW64\static\libusb-1.0.a Software\PC_Application\LibreVNA-GUI
shell: cmd shell: cmd
@ -134,10 +134,9 @@ jobs:
cd Software/PC_Application/LibreVNA-GUI/release cd Software/PC_Application/LibreVNA-GUI/release
del *.o *.cpp del *.o *.cpp
windeployqt.exe . windeployqt.exe .
copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libwinpthread-1.dll . copy %QT_ROOT_DIR%\bin\libwinpthread-1.dll .
copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libgcc_s_seh-1.dll . copy %QT_ROOT_DIR%\bin\libgcc_s_seh-1.dll .
copy "..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libstdc++-6.dll" . copy %QT_ROOT_DIR%\bin\Qt6OpenGL.dll .
copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\Qt6OpenGL.dll .
shell: cmd shell: cmd
- name: Upload - name: Upload

15
.github/workflows/Release_tag_stable.yml vendored
View file

@ -110,16 +110,16 @@ jobs:
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v4
with: with:
version: '6.2.0' version: '6.2.4'
arch: 'win64_mingw81' arch: 'win64_mingw'
- name: Download libusb - name: Download libusb
run: | run: |
curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.25/libusb-1.0.25.7z 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 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 Xcopy /E /I /Y libusb\MinGW64\static\libusb-1.0.a Software\PC_Application\LibreVNA-GUI
shell: cmd shell: cmd
@ -145,10 +145,9 @@ jobs:
cd Software/PC_Application/LibreVNA-GUI/release cd Software/PC_Application/LibreVNA-GUI/release
del *.o *.cpp del *.o *.cpp
windeployqt.exe . windeployqt.exe .
copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libwinpthread-1.dll . copy %QT_ROOT_DIR%\bin\libwinpthread-1.dll .
copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libgcc_s_seh-1.dll . copy %QT_ROOT_DIR%\bin\libgcc_s_seh-1.dll .
copy "..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libstdc++-6.dll" . copy %QT_ROOT_DIR%\bin\Qt6OpenGL.dll .
copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\Qt6OpenGL.dll .
shell: cmd shell: cmd
- name: Zip app - name: Zip app