From 1998db5dede0fd1d0b9803960fdb64e264fda5c3 Mon Sep 17 00:00:00 2001 From: Meliox Date: Sun, 7 Jun 2026 17:50:31 +0200 Subject: [PATCH] version fixes --- .github/workflows/release.yml | 8 ++++++++ .github/workflows/test-release.yml | 9 +++++++++ src/PVENodeInfo/PVEMod_Config.pm | 2 +- src/PVENodeInfo/PveMod_SensorInfo.pm | 3 +++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 09176b5..4bcaacd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,6 +37,14 @@ jobs: sudo apt-get update -qq sudo apt-get install -y debhelper dpkg-dev + - name: Inject version into PVEMod_Config.pm + env: + BUILD_VERSION: ${{ steps.version.outputs.version }} + run: | + perl -i -pe 'BEGIN { $v = $ENV{BUILD_VERSION} } + s/(our \$VERSION\s*=\s*'"'"')[^'"'"']*'"'"';/$1'"'"'$v'"'"';/ + ' src/PVENodeInfo/PVEMod_Config.pm + - name: Build deb package run: | dpkg-buildpackage -us -uc -b diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml index 407b044..3867bb6 100644 --- a/.github/workflows/test-release.yml +++ b/.github/workflows/test-release.yml @@ -22,6 +22,15 @@ jobs: - name: Install build deps run: sudo apt-get install -y devscripts debhelper build-essential + - name: Inject version into PVEMod_Config.pm + run: | + VERSION=$(grep -m1 '(' debian/changelog | sed 's/.*(\(.*\)).*/\1/') + SHORT_SHA=$(git rev-parse --short HEAD) + export BUILD_VERSION="${VERSION}-test-${SHORT_SHA}" + perl -i -pe 'BEGIN { $v = $ENV{BUILD_VERSION} } + s/(our \$VERSION\s*=\s*'"'"')[^'"'"']*'"'"';/$1'"'"'$v'"'"';/ + ' src/PVENodeInfo/PVEMod_Config.pm + - name: Build package run: dpkg-buildpackage -us -uc -b diff --git a/src/PVENodeInfo/PVEMod_Config.pm b/src/PVENodeInfo/PVEMod_Config.pm index ad17b22..4678f72 100644 --- a/src/PVENodeInfo/PVEMod_Config.pm +++ b/src/PVENodeInfo/PVEMod_Config.pm @@ -18,7 +18,7 @@ our @EXPORT_OK = qw( # ============================================================================ our $DEBUG_ENABLED = 1; -our $VERSION = '1.0'; +our $VERSION = 'version-placeholder'; # Runtime process-type tag — set to 'worker' or 'collector' after fork. # Each forked child gets its own copy of this variable. diff --git a/src/PVENodeInfo/PveMod_SensorInfo.pm b/src/PVENodeInfo/PveMod_SensorInfo.pm index d0b71fc..6e777c9 100644 --- a/src/PVENodeInfo/PveMod_SensorInfo.pm +++ b/src/PVENodeInfo/PveMod_SensorInfo.pm @@ -193,8 +193,11 @@ sub get_ups_info { sub get_pve_mod_version { debug(__LINE__, "get_pve_mod_version called"); + # Notify pve_mod_worker of activity notify_pve_mod_worker(); + + debug(__LINE__, "Returning version: $VERSION"); return $VERSION; }