jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-01-20 15:40:38 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Adjust workflows, disable debug build for firmware

Browse source
This commit is contained in:
Jan Käberich 2024-04-22 12:05:53 +02:00
parent e3b4972025
commit f897d98ab0
3 changed files with 2 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/Build.yml vendored
View file

@ -4,7 +4,6 @@ on:
push:
branches:
- master
- HIL_actions
pull_request:
branches:
- master

31
.github/workflows/HIL_Tests.yml vendored
View file

@ -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

2
Software/VNA_embedded/Makefile
View file

@ -20,7 +20,7 @@ TARGET = VNA_embedded
# building variables
######################################
# debug build?
DEBUG = 1
DEBUG = 0
# optimization
OPT = -O2