From e79d4603fc03168a76ef5dd409e36f15331c2b1c Mon Sep 17 00:00:00 2001 From: proddy Date: Fri, 18 Jun 2021 21:42:16 +0200 Subject: [PATCH 1/2] replace TRACE with ALL --- interface/src/system/LogEventConsole.tsx | 4 ++-- interface/src/system/LogEventForm.tsx | 2 +- interface/src/system/types.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/system/LogEventConsole.tsx b/interface/src/system/LogEventConsole.tsx index 1942639a0..d3ac4786b 100644 --- a/interface/src/system/LogEventConsole.tsx +++ b/interface/src/system/LogEventConsole.tsx @@ -87,8 +87,8 @@ const LogEventConsole: FC = (props) => { return 'NOTICE'; case LogLevel.WARNING: return 'WARNING'; - case LogLevel.TRACE: - return 'TRACE'; + case LogLevel.ALL: + return 'ALL'; default: return '?'; } diff --git a/interface/src/system/LogEventForm.tsx b/interface/src/system/LogEventForm.tsx index f234e8a2d..16de6ba0e 100644 --- a/interface/src/system/LogEventForm.tsx +++ b/interface/src/system/LogEventForm.tsx @@ -87,7 +87,7 @@ class LogEventForm extends Component { NOTICE INFO DEBUG - TRACE + ALL diff --git a/interface/src/system/types.ts b/interface/src/system/types.ts index 0f236c1f8..2c6ea0d9c 100644 --- a/interface/src/system/types.ts +++ b/interface/src/system/types.ts @@ -43,7 +43,7 @@ export enum LogLevel { NOTICE = 5, INFO = 6, DEBUG = 7, - TRACE = 8 + ALL = 9 } export interface LogEvent { From fdbbfe8ddbbb49c610cf6ab68a0d11bc3c9855b1 Mon Sep 17 00:00:00 2001 From: Proddy Date: Sat, 19 Jun 2021 13:27:47 +0200 Subject: [PATCH 2/2] Update pre_release.yml node to v16 --- .github/workflows/pre_release.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pre_release.yml b/.github/workflows/pre_release.yml index f99027c89..243cff4c4 100644 --- a/.github/workflows/pre_release.yml +++ b/.github/workflows/pre_release.yml @@ -13,36 +13,35 @@ jobs: steps: - - name: Checkout source code + - name: Get EMS-ESP source code and version uses: actions/checkout@v2 - - - name: Get build variables id: build_info run: | version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'` echo "::set-output name=version::$version" - - name: Setup Python - uses: actions/setup-python@v2 - - - name: Install pio + - name: Install PlatformIO + uses: actions/setup-python@v2 run: | python -m pip install --upgrade pip pip install -U platformio platformio upgrade platformio update - - name: Build web + - name: Build WebUI + uses: actions/setup-node@v2 + with: + node-version: '16' run: | cd interface - npm install + npm ci npm run build - name: Build firmware run: | platformio run -e ci - - name: Release + - name: Create a GH Release id: "automatic_releases" uses: "marvinpinto/action-automatic-releases@latest" with: @@ -53,4 +52,4 @@ jobs: files: | CHANGELOG_LATEST.md ./build/firmware/*.* - +