From 2a3343d46475001bd60e1e56b4cefe8d78ce20b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=A4berich?= <j.kaeberich@gmx.de>
Date: Mon, 22 Apr 2024 17:17:14 +0200
Subject: [PATCH] update other workflows

---
 .github/workflows/Build.yml              |  4 +--
 .github/workflows/Release_tag_stable.yml | 39 ++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index 94039ae..cb6874a 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -58,7 +58,6 @@ jobs:
         run: |
           sudo apt-get update
           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
         id: id_date
@@ -76,8 +75,7 @@ jobs:
       - name: Build application
         run: |
           cd Software/PC_Application/LibreVNA-GUI
-          export QT_SELECT=qt6
-          qmake LibreVNA-GUI.pro
+          qmake6 LibreVNA-GUI.pro
           make -j9
         shell: bash
 
diff --git a/.github/workflows/Release_tag_stable.yml b/.github/workflows/Release_tag_stable.yml
index 8da775a..edf3cf0 100644
--- a/.github/workflows/Release_tag_stable.yml
+++ b/.github/workflows/Release_tag_stable.yml
@@ -63,6 +63,45 @@ jobs:
           asset_name: LibreVNA-GUI-Ubuntu-${{env.LIBREVNA_VERSION}}.zip
           asset_content_type: application/tar+gzip
           
+  PC_Application_RPi5:
+    needs: PC_Application_Ubuntu
+    runs-on: RPi-HIL
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libusb-1.0-0-dev qt6-tools-dev qt6-base-dev
+
+      - name: Get app version
+        id: id_version
+        run: |
+          cd Software/PC_Application/LibreVNA-GUI
+          fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro`
+          fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' LibreVNA-GUI.pro`
+          fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' LibreVNA-GUI.pro` 
+          echo "app_version=v$fw_major.$fw_minor.$fw_patch" >> $GITHUB_OUTPUT
+
+      - name: Build application
+        run: |
+          cd Software/PC_Application/LibreVNA-GUI
+          qmake6 LibreVNA-GUI.pro
+          make -j9
+          zip LibreVNA-GUI.zip LibreVNA-GUI
+        shell: bash
+
+      - name: 'Upload release asset'
+        uses: actions/upload-release-asset@v1
+        env:
+          LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.bump_release.outputs.upload_url }}
+          asset_path: ./Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.zip
+          asset_name: LibreVNA-GUI-RPi5-${{env.LIBREVNA_VERSION}}.zip
+          asset_content_type: application/tar+gzip
+          
   PC_Application_Windows:
     needs: PC_Application_Ubuntu
     runs-on: windows-2019