Merge pull request #72 from bl4ckswordsman/add-build-version

feat: Add build version to the Windows build

.github/workflows/build_and_release.yaml

@@ -130,4 +130,4 @@ jobs:
             DiscoBeacon_Linux_${{ env.VERSION }}.tar.gz \
             --clobber
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test_build_windows.yaml

@@ -21,12 +21,21 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r requirements.txt
           pip install pillow
+      - name: Set test version
+        run: |
+          $timestamp = [System.TimeZoneInfo]::ConvertTimeBySystemTimeZoneId((Get-Date), 'Central European Standard Time').ToString("yyyyMMdd-HHmm")
+          # Read version from version.py and append timestamp
+          $version = (Get-Content version.py | Select-String 'VERSION = "(.*)"').Matches.Groups[1].Value
+          $testVersion = "$version-test-$timestamp"
+          echo "VERSION=$testVersion" >> $env:GITHUB_ENV
+          # Update version.py with test version
+          (Get-Content version.py) -replace 'VERSION = ".*"', "VERSION = `"$testVersion`"" | Set-Content version.py
       - name: Build executable
         run: |
           pyinstaller --clean disco_beacon.spec
       - name: Upload test artifact
         uses: actions/upload-artifact@v4
         with:
-          name: DiscoBeacon_Windows_Test
+          name: DiscoBeacon_Windows_Test_${{ env.VERSION }}
           path: ${{ github.workspace }}/monitor-app/dist/DiscoBeacon.exe
-          retention-days: 5
+          retention-days: 5

monitor-app/disco_beacon.spec

@@ -43,6 +43,7 @@ exe = EXE(
     a.datas,
     [],
     name='DiscoBeacon',
+    version_file=None,  # Version info from version.py will be shown in the app
     debug=False,
     bootloader_ignore_signals=False,
     strip=False,
@@ -88,6 +89,7 @@ if platform.system() == "Windows":
         a_windows.datas,
         [],
         name='DiscoBeacon',
+        version_file=None,  # Version info from version.py will be shown in the app
         debug=False,
         bootloader_ignore_signals=False,
         strip=False,

monitor-app/src/gui/settings_dialog.py

@@ -1,5 +1,6 @@
-from PySide6.QtWidgets import QDialog, QVBoxLayout, QFormLayout, QLineEdit, QSpinBox, QPushButton, QComboBox
-from PySide6.QtCore import Signal
+from PySide6.QtWidgets import QDialog, QVBoxLayout, QFormLayout, QLineEdit, QSpinBox, QPushButton, QComboBox, QLabel
+from PySide6.QtCore import Signal, Qt
+from version import __version__
 from src.core.app_settings import app_settings
 from src.core import constants
 from src.gui.utils.platform_utils import is_windows_11
@@ -47,6 +48,17 @@ def __init__(self, parent=None):
         save_button.clicked.connect(self.save_settings)
         self.layout.addWidget(save_button)
 
+        # Add build version at bottom with styling
+        self.build_version_label = QLabel(f"Version {__version__}")
+        self.build_version_label.setStyleSheet("""
+            QLabel {
+                font-size: 9pt;
+                padding: 5px;
+            }
+        """)
+        self.build_version_label.setAlignment(Qt.AlignmentFlag.AlignRight)
+        self.layout.addWidget(self.build_version_label)
+
     def save_settings(self):
         app_settings.set('webhook_url', self.webhook_url.text())
         app_settings.set('api_key', self.api_key.text())

monitor-app/src/gui/utils/app_settings.py

@@ -16,3 +16,7 @@ def set_app_metadata(cls):
     @classmethod
     def get_app_icon(cls):
         return QIcon(cls.ICON_PATH)
+
+    @classmethod
+    def get_build_version(cls):
+        return QCoreApplication.applicationVersion()

monitor-app/version.py

@@ -1 +1,3 @@
-__version__ = "0.0.1" # Pre-release version
+VERSION = "0.0.1-hotfix2"
+
+__version__ = VERSION