From 6374219e05eb381d93a44584d8c47639fa02cbc1 Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob.sk@gmail.com>
Date: Thu, 6 Nov 2025 20:47:28 +1100
Subject: [PATCH] BE: github actions + dev version

Signed-off-by: jokob-sk <jokob.sk@gmail.com>
---
 .github/workflows/docker_dev.yml | 19 +++++++++++++++----
 server/helper.py                 |  5 ++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index 08c4bdba..97da1434 100755
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -10,7 +10,7 @@ on:
     branches:
       - next_release
 
-jobs: 
+jobs:
   docker_dev:
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -19,7 +19,8 @@ jobs:
       packages: write
     if: >
       contains(github.event.head_commit.message, 'PUSHPROD') != 'True' &&
-      github.repository == 'jokob-sk/NetAlertX'  
+      github.repository == 'jokob-sk/NetAlertX'
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -30,16 +31,25 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      # --- Generate timestamped dev version
+      - name: Generate timestamp version
+        id: timestamp
+        run: |
+          ts=$(date -u +'%Y%m%d-%H%M%S')
+          echo "version=dev-${ts}" >> $GITHUB_OUTPUT
+          echo "Generated version: dev-${ts}"
+
       - name: Set up dynamic build ARGs
-        id: getargs        
+        id: getargs
         run: echo "version=$(cat ./stable/VERSION)" >> $GITHUB_OUTPUT
 
       - name: Get release version
         id: get_version
         run: echo "version=Dev" >> $GITHUB_OUTPUT
 
+      # --- Write the timestamped version to .VERSION file
       - name: Create .VERSION file
-        run: echo "${{ steps.get_version.outputs.version }}" >> .VERSION
+        run: echo "${{ steps.timestamp.outputs.version }}" > .VERSION
 
       - name: Docker meta
         id: meta
@@ -50,6 +60,7 @@ jobs:
             jokobsk/netalertx-dev
           tags: |
             type=raw,value=latest
+            type=raw,value=${{ steps.timestamp.outputs.version }}
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}
diff --git a/server/helper.py b/server/helper.py
index 7a89c270..d33767af 100755
--- a/server/helper.py
+++ b/server/helper.py
@@ -666,7 +666,6 @@ def getBuildTimeStamp():
 def checkNewVersion():
     mylog('debug', [f"[Version check] Checking if new version available"])
 
-    newVersion = False
     buildTimestamp = getBuildTimeStamp()
 
     try:
@@ -693,13 +692,13 @@ def checkNewVersion():
 
         if releaseTimestamp > buildTimestamp + 600:
             mylog('none', ["[Version check] New version of the container available!"])
-            newVersion = True
+            return True
         else:
             mylog('none', ["[Version check] Running the latest version."])
     else:
         mylog('minimal', ["[Version check] ⚠ ERROR: Received unexpected response from GitHub."])
 
-    return newVersion
+    return False
 
 #-------------------------------------------------------------------------------
 class noti_obj: