From ca9a5140a21652e947569804ef8ebdf41ab22a26 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Wed, 23 Feb 2022 08:12:24 +0100 Subject: [PATCH] updated version information inside tnc and some changes for our github actions as well... --- .github/workflows/build-project-linux.yml | 1 + .github/workflows/build-project-mac.yml | 1 + .github/workflows/build-project-win.yml | 3 ++- tnc/daemon.py | 3 ++- tnc/main.py | 2 +- tnc/static.py | 4 ++-- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-project-linux.yml b/.github/workflows/build-project-linux.yml index f2e934ae..04dcdb51 100644 --- a/.github/workflows/build-project-linux.yml +++ b/.github/workflows/build-project-linux.yml @@ -99,6 +99,7 @@ jobs: uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/v') with: + draft: true files: ./tnc/dist/compressed/${{ matrix.zip_name }}.zip - name: Copy TNC to GUI Linux diff --git a/.github/workflows/build-project-mac.yml b/.github/workflows/build-project-mac.yml index fae16950..cee64c17 100644 --- a/.github/workflows/build-project-mac.yml +++ b/.github/workflows/build-project-mac.yml @@ -87,6 +87,7 @@ jobs: uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/v') with: + draft: true files: ./tnc/dist/compressed/${{ matrix.zip_name }}.zip diff --git a/.github/workflows/build-project-win.yml b/.github/workflows/build-project-win.yml index cead86eb..5a63f21c 100644 --- a/.github/workflows/build-project-win.yml +++ b/.github/workflows/build-project-win.yml @@ -70,7 +70,7 @@ jobs: uses: thedoctor0/zip-release@master with: type: 'zip' - filename: 'FreeDATA_windows.zip' + filename: '${{ matrix.zip_name }}.zip' directory: ./tnc/dist/tnc path: . #exclusions: '*.git* /*node_modules/* .editorconfig' @@ -85,6 +85,7 @@ jobs: uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/v') with: + draft: true files: ./tnc/dist/tnc/${{ matrix.zip_name }}.zip diff --git a/tnc/daemon.py b/tnc/daemon.py index 83054d4e..fe1d931a 100755 --- a/tnc/daemon.py +++ b/tnc/daemon.py @@ -304,7 +304,7 @@ if __name__ == '__main__': os.makedirs(logging_path) log_handler.setup_logging(logging_path) except: - structlog.get_logger("structlog").error("[TNC] logger init error") + structlog.get_logger("structlog").error("[DMN] logger init error") try: structlog.get_logger("structlog").info("[DMN] Starting TCP/IP socket", port=static.DAEMONPORT) @@ -321,5 +321,6 @@ if __name__ == '__main__': daemon = DAEMON() + structlog.get_logger("structlog").info("[DMN] Starting FreeDATA Daemon", author="DJ2LS", year="2022", version=static.VERSION) while True: time.sleep(1) diff --git a/tnc/main.py b/tnc/main.py index 43ad9e43..09315284 100644 --- a/tnc/main.py +++ b/tnc/main.py @@ -108,7 +108,7 @@ if __name__ == '__main__': - structlog.get_logger("structlog").info("[TNC] Starting FreeDATA", author="DJ2LS", year="2022", version="0.1") + structlog.get_logger("structlog").info("[TNC] Starting FreeDATA", author="DJ2LS", year="2022", version=static.VERSION) # start data handler data_handler.DATA() diff --git a/tnc/static.py b/tnc/static.py index d53fddad..84b2456b 100644 --- a/tnc/static.py +++ b/tnc/static.py @@ -5,10 +5,10 @@ Created on Wed Dec 23 11:13:57 2020 @author: DJ2LS Here we are saving application wide variables and stats, which have to be accessed everywhere. -Not nice, tipps are appreciated :-) +Not nice, suggestions are appreciated :-) """ -VERSION = '0.1' +VERSION = '0.0.1-alpha' # DAEMON DAEMONPORT = 3001