Adjust workflows, disable debug build for firmware

jankae · Apr 22, 2024 · f897d98 · f897d98
1 parent e3b4972
commit f897d98
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 32 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - HIL_actions
   pull_request:
     branches:
       - master

diff --git a/.github/workflows/HIL_Tests.yml b/.github/workflows/HIL_Tests.yml
@@ -19,26 +19,11 @@ 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
-        run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT
-
-      - 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-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT
 
       - 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
 
@@ -51,20 +36,6 @@ jobs:
         run: |
           sudo apt-get install -y gcc-arm-none-eabi binutils-arm-none-eabi
         
-      - name: Get build timestamp
-        id: id_date
-        run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT
-
-      - name: Get app version
-        id: id_version
-        run: |
-          cd Software/VNA_embedded
-          fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' Makefile`
-          fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' Makefile`
-          fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' Makefile`
-          hw_revision=`grep "DHW_REVISION=" Makefile | sed "s/-DHW_REVISION=\"'//" | sed "sr'\" [\]rr"`
-          echo "app_version=hw-rev-$hw_revision-v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT
-
       - name: Build application
         run: |
           cd Software/VNA_embedded

diff --git a/Software/VNA_embedded/Makefile b/Software/VNA_embedded/Makefile
@@ -20,7 +20,7 @@ TARGET = VNA_embedded
 # building variables
 ######################################
 # debug build?
-DEBUG = 1
+DEBUG = 0
 # optimization
 OPT = -O2