From 2221c8fe8c266e2264102d1ad113ce5a00adfd2d Mon Sep 17 00:00:00 2001 From: Meliox <5264368+Meliox@users.noreply.github.com> Date: Sat, 13 Jun 2026 17:34:29 +0200 Subject: [PATCH] workflow: changes to make test workflow work (#207) * test6 * fix function call * add final missing newline to patch * remove existing config prompt * add pve-yew-mobile-gui to dep and test --------- Co-authored-by: Meliox --- debian/pve-mod.triggers | 1 + src/Scripts/pve-mod-configure | 11 +---------- src/Scripts/test/fetch-proxmox-files.sh | 4 ++-- .../patches/01-proxmoxlib-js-nagscreen.patch | 2 +- .../patches/02-nodes-pm-GPU-RRD-history.patch | 13 ++++++------- src/test.yml | 2 +- 6 files changed, 12 insertions(+), 21 deletions(-) diff --git a/debian/pve-mod.triggers b/debian/pve-mod.triggers index c0a852c..0dabd7a 100644 --- a/debian/pve-mod.triggers +++ b/debian/pve-mod.triggers @@ -1,2 +1,3 @@ interest-noawait /usr/share/pve-manager/js interest-noawait /usr/share/perl5/PVE +interest-noawait /usr/share/pve-yew-mobile-gui diff --git a/src/Scripts/pve-mod-configure b/src/Scripts/pve-mod-configure index 9001143..ab66c09 100644 --- a/src/Scripts/pve-mod-configure +++ b/src/Scripts/pve-mod-configure @@ -27,7 +27,7 @@ ask() { } bool() { [[ "$1" == true ]] && echo 1 || echo 0; } -_load_conf_debug() { +_load_conf() { [[ -f "$NODE_INFO_CONF" ]] || return 0 local in_debug=0 line key val while IFS= read -r line; do @@ -565,15 +565,6 @@ main() { err "A legacy pve-mod bash-script installation was detected in Nodes.pm.\nRemove it first:\n bash /path/to/pve-mod-gui-sensors.sh uninstall" fi - # ── Existing config notice ──────────────────────────────────────────────── - if [[ -f "$CONF_FILE" ]]; then - local choice - choice=$(ask "Existing configuration found at $CONF_FILE — Reconfigure? (Y/n)") - case "$choice" in - [nN]) info "Keeping existing configuration."; exit 0 ;; - esac - fi - # ── Initialize all config variables with safe defaults ──────────────────── MOD_NODE_INFO=0; MOD_NAG_SCREEN=0 LM_SENSORS_ENABLED=0 diff --git a/src/Scripts/test/fetch-proxmox-files.sh b/src/Scripts/test/fetch-proxmox-files.sh index b449a3c..1a37be6 100644 --- a/src/Scripts/test/fetch-proxmox-files.sh +++ b/src/Scripts/test/fetch-proxmox-files.sh @@ -13,9 +13,9 @@ echo "deb [trusted=yes] http://download.proxmox.com/debian/pve $SUITE pve-no-sub | sudo tee /etc/apt/sources.list.d/pve-test.list >/dev/null sudo apt-get update -qq -echo "[fetch] Downloading pve-manager and proxmox-widget-toolkit..." +echo "[fetch] Downloading pve-manager, proxmox-widget-toolkit, and pve-yew-mobile-gui..." cd "$WORKDIR" -apt-get download pve-manager proxmox-widget-toolkit +apt-get download pve-manager proxmox-widget-toolkit pve-yew-mobile-gui echo "[fetch] Extracting to system paths..." for deb in *.deb; do diff --git a/src/nag_screen/patches/01-proxmoxlib-js-nagscreen.patch b/src/nag_screen/patches/01-proxmoxlib-js-nagscreen.patch index 43d9e31..5957063 100644 --- a/src/nag_screen/patches/01-proxmoxlib-js-nagscreen.patch +++ b/src/nag_screen/patches/01-proxmoxlib-js-nagscreen.patch @@ -39,4 +39,4 @@ + orig_cmd(); }, - assemble_field_data: function (values, data) { \ No newline at end of file + assemble_field_data: function (values, data) { diff --git a/src/node_info/patches/02-nodes-pm-GPU-RRD-history.patch b/src/node_info/patches/02-nodes-pm-GPU-RRD-history.patch index 1cfe758..6d3571f 100644 --- a/src/node_info/patches/02-nodes-pm-GPU-RRD-history.patch +++ b/src/node_info/patches/02-nodes-pm-GPU-RRD-history.patch @@ -1,5 +1,5 @@ ---- a/usr/share/perl5/PVE/API2/Nodes.pm -+++ b/usr/share/perl5/PVE/API2/Nodes.pm +--- usr/share/perl5/PVE/API2/Nodes.pm 2026-05-24 02:05:58.000000000 +0200 ++++ /usr/share/perl5/PVE/API2/Nodes.pm 2026-06-13 16:29:47.810720485 +0200 @@ -251,6 +251,7 @@ { name => 'report' }, { name => 'rrd' }, # fixme: remove? @@ -8,12 +8,10 @@ { name => 'scan' }, { name => 'sdn' }, { name => 'services' }, -@@ -878,6 +879,57 @@ - "pve-node-9.0/$param->{node}", $param->{timeframe}, $param->{cf}, +@@ -879,6 +880,56 @@ ); }, --}); -+}); + }); + +__PACKAGE__->register_method({ + name => 'gpurrddata', @@ -65,4 +63,5 @@ + }, +}); - __PACKAGE__->register_method({ \ No newline at end of file + __PACKAGE__->register_method({ + name => 'syslog', diff --git a/src/test.yml b/src/test.yml index bf18272..7019a74 100644 --- a/src/test.yml +++ b/src/test.yml @@ -1 +1 @@ -trigger workflow test 1, 2, 3, 4, 5 \ No newline at end of file +trigger workflow test 1, 2, 3, 4, 5, 6 \ No newline at end of file