split test and build workflow, adjust windows copy path
This commit is contained in:
parent
fa7d789935
commit
96f8b6c90a
30
.github/workflows/Build.yml
vendored
30
.github/workflows/Build.yml
vendored
@ -10,28 +10,6 @@ on:
|
|||||||
- master
|
- master
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
Tests:
|
|
||||||
runs-on: ubuntu-18.04
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y libusb-1.0-0-dev qt5-default qt5-qmake qtbase5-dev
|
|
||||||
|
|
||||||
- name: Build Tests
|
|
||||||
run: |
|
|
||||||
cd Software/PC_Application/LibreVNA-Test
|
|
||||||
qmake LibreVNA-Test.pro
|
|
||||||
make -j9
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
- name: Run Tests
|
|
||||||
run: |
|
|
||||||
cd Software/PC_Application/LibreVNA-Test
|
|
||||||
./LibreVNA-Test
|
|
||||||
|
|
||||||
PC_Application_Ubuntu:
|
PC_Application_Ubuntu:
|
||||||
runs-on: ubuntu-18.04
|
runs-on: ubuntu-18.04
|
||||||
steps:
|
steps:
|
||||||
@ -117,10 +95,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.1\mingw81_64\bin\libwinpthread-1.dll .
|
copy ..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\libwinpthread-1.dll .
|
||||||
copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\libgcc_s_seh-1.dll .
|
copy ..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\libgcc_s_seh-1.dll .
|
||||||
copy "..\..\..\..\Qt\5.15.1\mingw81_64\bin\libstdc++-6.dll" .
|
copy "..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\libstdc++-6.dll" .
|
||||||
copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\Qt5OpenGL.dll .
|
copy ..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\Qt5OpenGL.dll .
|
||||||
shell: cmd
|
shell: cmd
|
||||||
|
|
||||||
- name: Upload
|
- name: Upload
|
||||||
|
8
.github/workflows/Release_tag_stable.yml
vendored
8
.github/workflows/Release_tag_stable.yml
vendored
@ -104,10 +104,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.1\mingw81_64\bin\libwinpthread-1.dll .
|
copy ..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\libwinpthread-1.dll .
|
||||||
copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\libgcc_s_seh-1.dll .
|
copy ..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\libgcc_s_seh-1.dll .
|
||||||
copy "..\..\..\..\Qt\5.15.1\mingw81_64\bin\libstdc++-6.dll" .
|
copy "..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\libstdc++-6.dll" .
|
||||||
copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\Qt5OpenGL.dll .
|
copy ..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\Qt5OpenGL.dll .
|
||||||
shell: cmd
|
shell: cmd
|
||||||
|
|
||||||
- name: Zip app
|
- name: Zip app
|
||||||
|
34
.github/workflows/Test.yml
vendored
Normal file
34
.github/workflows/Test.yml
vendored
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
name: Build
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
- compoundDevice
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
Tests:
|
||||||
|
runs-on: ubuntu-18.04
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v1
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y libusb-1.0-0-dev qt5-default qt5-qmake qtbase5-dev
|
||||||
|
|
||||||
|
- name: Build Tests
|
||||||
|
run: |
|
||||||
|
cd Software/PC_Application/LibreVNA-Test
|
||||||
|
qmake LibreVNA-Test.pro
|
||||||
|
make -j9
|
||||||
|
shell: bash
|
||||||
|
|
||||||
|
- name: Run Tests
|
||||||
|
run: |
|
||||||
|
cd Software/PC_Application/LibreVNA-Test
|
||||||
|
./LibreVNA-Test
|
||||||
|
|
Loading…
Reference in New Issue
Block a user