From 96f8b6c90a3e2ae3887a4306993d38ab0eebd7bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=A4berich?= <j.kaeberich@gmx.de>
Date: Sat, 1 Oct 2022 17:25:07 +0200
Subject: [PATCH] split test and build workflow, adjust windows copy path

---
 .github/workflows/Build.yml              | 30 +++------------------
 .github/workflows/Release_tag_stable.yml |  8 +++---
 .github/workflows/Test.yml               | 34 ++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 30 deletions(-)
 create mode 100644 .github/workflows/Test.yml

diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index a94a208..1f29395 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -10,28 +10,6 @@ on:
       - 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
-
   PC_Application_Ubuntu:
     runs-on: ubuntu-18.04
     steps:
@@ -117,10 +95,10 @@ jobs:
           cd Software/PC_Application/LibreVNA-GUI/release
           del *.o *.cpp
           windeployqt.exe .
-          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\libstdc++-6.dll" .
-          copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\Qt5OpenGL.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\libstdc++-6.dll" .
+          copy ..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\Qt5OpenGL.dll .
         shell: cmd
         
       - name: Upload
diff --git a/.github/workflows/Release_tag_stable.yml b/.github/workflows/Release_tag_stable.yml
index 86a4180..558170d 100644
--- a/.github/workflows/Release_tag_stable.yml
+++ b/.github/workflows/Release_tag_stable.yml
@@ -104,10 +104,10 @@ jobs:
           cd Software/PC_Application/LibreVNA-GUI/release
           del *.o *.cpp
           windeployqt.exe .
-          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\libstdc++-6.dll" .
-          copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\Qt5OpenGL.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\libstdc++-6.dll" .
+          copy ..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\Qt5OpenGL.dll .
         shell: cmd
 
       - name: Zip app
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
new file mode 100644
index 0000000..9a53f37
--- /dev/null
+++ b/.github/workflows/Test.yml
@@ -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
+