taler-deployment

commit 40bd360b74223dd0cb41f1d4ff8257e83f140857
parent ff332f3e3bf194b3d4768e6c0bc4c0a69980c20b
Author: Florian Dold <florian@dold.me>
Date:   Thu, 21 Aug 2025 01:11:14 +0200

use ~CODENAME suffix in debian package to allow multiple packages per version that differ between codenames

Diffstat:
M
packaging/ng/buildscripts/generic.sh
 | 
8
++++++++
M
packaging/ng/taler-pkg
 | 
4
+++-

2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/packaging/ng/buildscripts/generic.sh b/packaging/ng/buildscripts/generic.sh
@@ -12,6 +12,8 @@ if [[ -e /buildconfig/$PACKAGE.debpath ]]; then
   DEBIANPATH=$(cat /buildconfig/$PACKAGE.debpath)
 fi
 
+CODENAME=${2:-}
+
 echo Building $1 with generic build logic >&2
 
 TAG=$(cat /buildconfig/$PACKAGE.tag)
@@ -58,6 +60,12 @@ export DEB_DBG_SYMBOLS_REPO="debian/.debhelper/"
 mkdir -p "${DEB_DBG_SYMBOLS_REPO}"
 touch "${DEB_DBG_SYMBOLS_REPO}/debian-symbols-pool"
 export DEB_BUILD_MAINT_OPTIONS=debug
+
+# Add distro/codename specific version trailer.
+if [[ ! -z $CODENAME ]]; then
+  DEBEMAIL=deb@taler.net NAME="Taler Packaging Team" dch -b --distribution unstable --newversion "$DEB_VERSION~$CODENAME" "Build for $CODENAME"
+fi
+
 dpkg-buildpackage -rfakeroot -b -uc -us
 cp ../*.deb /pkgdir/
 cp ../*.ddeb /pkgdir/ &> /dev/null || true
diff --git a/packaging/ng/taler-pkg b/packaging/ng/taler-pkg
@@ -125,6 +125,7 @@ def build(cfg):
     if cfg.transitive:
         transitive = True
     distro = cfg.distro
+    vendor, codename = distro.split("-", 1)
     print("building", distro)
     dockerfile = f"distros/Dockerfile.{distro}"
     image_tag = f"taler-packaging-{distro}:latest"
@@ -171,6 +172,7 @@ def build(cfg):
             image_tag,
             "/buildscripts/generic.sh",
             component,
+            codename,
         ]
         if not cfg.dry:
             subprocess.run(
@@ -308,7 +310,7 @@ def publish(cfg):
                 f"reprepro -b /home/taler-packaging/www/apt/{vendor}/ includedeb {codename}-testing ~/debian-trixie/*.deb",
             ],
         )
-        if ret != 0:
+        if ret.returncode != 0:
             # Usually not critical if it fails.
             print("Including debs failed. This can happen when including packages that have been included previously")
     # Always export!