From 1257d9dca0f41dff99d676914830a049a1cec42f Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Wed, 6 Apr 2022 23:50:55 +0200 Subject: [PATCH 1/6] do kot creare a new version with every push request --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fd4ec4e..076e9f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,7 @@ name: Create new release on: - push: - branches: - - 'master' + workflow_dispatch: jobs: build: From b28d6ea3f45dee17c76d210482f99949a1d745a7 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 7 Apr 2022 11:01:15 +0200 Subject: [PATCH 2/6] remove version check from build --- .github/workflows/build_check.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml index 7686833..a5655db 100644 --- a/.github/workflows/build_check.yml +++ b/.github/workflows/build_check.yml @@ -10,20 +10,6 @@ on: - master jobs: - version_check: - name: Version Check - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set up Python - uses: actions/setup-python@v2 - - run: pip install GitPython - - name: check version - run: ./scripts/check_version.py - build: name: Compile Firmware runs-on: ubuntu-latest From b31709bf27931b882066e4e34871422765823188 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 7 Apr 2022 11:01:31 +0200 Subject: [PATCH 3/6] add version check on relaese --- .github/workflows/release.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 076e9f9..71a9939 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,22 @@ on: workflow_dispatch: jobs: - build: + version_check: + name: Version Check + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set up Python + uses: actions/setup-python@v2 + - run: pip install GitPython + - name: check version + run: ./scripts/check_version.py + + create_release: + needs: version_check name: Create new release runs-on: ubuntu-latest steps: From 7ddaf8f23c87f00adc71c15dc13ceb69cc6bd40b Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 7 Apr 2022 11:12:45 +0200 Subject: [PATCH 4/6] fix ota and wifi bug with ethernet --- src/LoRa_APRS_iGate.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index f2a2e35..554aad7 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -113,14 +113,15 @@ void setup() { if (userConfig.wifi.active) { LoRaSystem.getTaskManager().addAlwaysRunTask(&wifiTask); - LoRaSystem.getTaskManager().addTask(&otaTask); tcpip = true; - } else if (boardConfig->Type == eETH_BOARD) { + } + if (boardConfig->Type == eETH_BOARD) { LoRaSystem.getTaskManager().addAlwaysRunTask(ðTask); tcpip = true; } if (tcpip) { + LoRaSystem.getTaskManager().addTask(&otaTask); LoRaSystem.getTaskManager().addTask(&ntpTask); if (userConfig.ftp.active) { LoRaSystem.getTaskManager().addTask(&ftpTask); From bf6951c850f39b60a95745840a04c2d9904d32fe Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 7 Apr 2022 11:13:24 +0200 Subject: [PATCH 5/6] version bump --- src/LoRa_APRS_iGate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 554aad7..3793970 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -20,7 +20,7 @@ #include "TaskWifi.h" #include "project_configuration.h" -#define VERSION "22.13.3" +#define VERSION "22.14.1" #define MODULE_NAME "Main" String create_lat_aprs(double lat); From 42cd9a34f3cb83bdfc2d3d2f311a0531d115a893 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 7 Apr 2022 11:15:46 +0200 Subject: [PATCH 6/6] use correct version --- src/LoRa_APRS_iGate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 3793970..9ec796b 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -20,7 +20,7 @@ #include "TaskWifi.h" #include "project_configuration.h" -#define VERSION "22.14.1" +#define VERSION "22.14.0" #define MODULE_NAME "Main" String create_lat_aprs(double lat);