From 64b430f18235263aa3a404c1d3020a2cd3b73969 Mon Sep 17 00:00:00 2001 From: Kevin Adams Date: Mon, 22 Jun 2026 08:25:46 -0400 Subject: [PATCH] fix: create dists/error codename alias and fix cp -r overwrite bug dists/error was never written to gh-pages because the codename alias code was added after the v3.2.0 tag. The stable publish job only runs on v*.*.* tags, so all subsequent pushes to release/3.x only touched dists/testing. Bumping to v3.2.1 triggers stable publish to create it. Also fix: cp -r src dst when dst already exists puts src inside dst rather than replacing it. Add rm -rf before cp -r to guarantee a clean replace on every stable release. Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/build.yml | 2 ++ packaging/DEBIAN-multipath/changelog.Debian | 6 ++++++ packaging/DEBIAN-transitional/changelog.Debian | 6 ++++++ packaging/changelog.Debian | 8 ++++++++ perl5/PVE/Storage/Custom/TrueNAS.pm | 2 +- 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb1d65f..74f0d75 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -450,9 +450,11 @@ jobs: # Create codename alias directories (e.g. dists/error/ mirrors dists/v3/) # so that both Suite ("v3") and Codename ("error") work in sources.list. + # rm -rf first: cp -r puts src inside dst when dst already exists. for DIST in $DISTS; do CODENAME=$(_dist_codename "$DIST") if [[ "$CODENAME" != "$DIST" ]]; then + rm -rf "${PAGES_DIR}/dists/${CODENAME}" cp -r "${PAGES_DIR}/dists/${DIST}" "${PAGES_DIR}/dists/${CODENAME}" fi done diff --git a/packaging/DEBIAN-multipath/changelog.Debian b/packaging/DEBIAN-multipath/changelog.Debian index 5599546..d20d8ca 100644 --- a/packaging/DEBIAN-multipath/changelog.Debian +++ b/packaging/DEBIAN-multipath/changelog.Debian @@ -1,3 +1,9 @@ +truenas-proxmox-multipath (3.2.1-1) bookworm; urgency=low + + * Version bump to match truenas-proxmox 3.2.1; no functional changes + + -- KSA Technologies, LLC Sun, 22 Jun 2026 00:00:00 +0000 + truenas-proxmox-multipath (3.1.0-1) bookworm; urgency=low * Initial release — kernel iSCSI multipath via iscsiadm + dm-multipath diff --git a/packaging/DEBIAN-transitional/changelog.Debian b/packaging/DEBIAN-transitional/changelog.Debian index 0b1a3a3..0b10872 100644 --- a/packaging/DEBIAN-transitional/changelog.Debian +++ b/packaging/DEBIAN-transitional/changelog.Debian @@ -1,3 +1,9 @@ +freenas-proxmox (3.2.1-1) bookworm; urgency=low + + * Version bump to match truenas-proxmox 3.2.1; no functional changes + + -- KSA Technologies, LLC Sun, 22 Jun 2026 00:00:00 +0000 + freenas-proxmox (3.0.0-1) bookworm; urgency=low * Transitional package — installs truenas-proxmox automatically diff --git a/packaging/changelog.Debian b/packaging/changelog.Debian index 18faa5e..0144abc 100644 --- a/packaging/changelog.Debian +++ b/packaging/changelog.Debian @@ -1,3 +1,11 @@ +truenas-proxmox (3.2.1-1) bookworm; urgency=low + + * Fix apt codename alias 'error' — dists/error was never created because + codename alias code was added after v3.2.0 tag; also fix cp -r overwrite + bug that would corrupt dists/error on second+ stable releases + + -- KSA Technologies, LLC Sun, 22 Jun 2026 00:00:00 +0000 + truenas-proxmox (3.0.0-1) bookworm; urgency=medium * Full rewrite as native PVE::Storage::Custom plugin — no PVE core patches diff --git a/perl5/PVE/Storage/Custom/TrueNAS.pm b/perl5/PVE/Storage/Custom/TrueNAS.pm index cb6e363..f5113d0 100644 --- a/perl5/PVE/Storage/Custom/TrueNAS.pm +++ b/perl5/PVE/Storage/Custom/TrueNAS.pm @@ -29,7 +29,7 @@ use PVE::Storage::Plugin; use base qw(PVE::Storage::Plugin); -our $VERSION = '3.2.0'; +our $VERSION = '3.2.1'; # Per-host runtime state cache my $state = {};