caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt to adapt the github workflows to Qt6

Browse Source
This commit is contained in:
Jan Käberich 2023-03-26 18:35:58 +02:00
parent f84a0f7c1a
commit ac2d532b0c
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.github/workflows/Build.yml vendored
View File

@ -4,20 +4,22 @@ on:
push: push:
branches: branches:
- master - master
- qt6
pull_request: pull_request:
branches: branches:
- master - master
jobs: jobs:
PC_Application_Ubuntu: PC_Application_Ubuntu:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y libusb-1.0-0-dev qt5-default qt5-qmake qtbase5-dev sudo apt-get install -y libusb-1.0-0-dev qt6-tools-dev qt6-base-dev
qtchooser -install qt6 $(which qmake6)
- name: Get build timestamp - name: Get build timestamp
id: id_date id: id_date
@ -35,6 +37,7 @@ jobs:
- name: Build application - name: Build application
run: | run: |
cd Software/PC_Application/LibreVNA-GUI cd Software/PC_Application/LibreVNA-GUI
export QT_SELECT=qt6
qmake LibreVNA-GUI.pro qmake LibreVNA-GUI.pro
make -j9 make -j9
shell: bash shell: bash
@ -56,14 +59,14 @@ jobs:
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: '5.15.2' version: '6.2.0'
arch: 'win64_mingw81' arch: 'win64_mingw81'
- 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\5.15.2\mingw81_64\include Xcopy /E /I /Y libusb\include ..\Qt\6.2.0\mingw81_64\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
@ -94,10 +97,10 @@ 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\5.15.2\mingw81_64\bin\libwinpthread-1.dll . copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libwinpthread-1.dll .
copy ..\..\..\..\..\Qt\5.15.2\mingw81_64\bin\libgcc_s_seh-1.dll . copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libgcc_s_seh-1.dll .
copy "..\..\..\..\..\Qt\5.15.2\mingw81_64\bin\libstdc++-6.dll" . copy "..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libstdc++-6.dll" .
copy ..\..\..\..\..\Qt\5.15.2\mingw81_64\bin\Qt5OpenGL.dll . copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\Qt6OpenGL.dll .
shell: cmd shell: cmd
- name: Upload - name: Upload
@ -115,11 +118,11 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
brew install qt@5 libusb pcre brew install qt@6 libusb pcre
- name: Set Environment - name: Set Environment
run: | run: |
echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH echo "/usr/local/opt/qt@6/bin" >> $GITHUB_PATH
- name: Get build timestamp - name: Get build timestamp
id: id_date id: id_date