taler-deployment

commit f1de1b36d1fe04692a457c989a3f93903ef915f8
parent 2b22fe0ab6cfa1c45b3c70b63c234035c0049655
Author: Florian Dold <florian@dold.me>
Date:   Thu, 20 Nov 2025 23:39:05 +0100

bump versions, improve computation of package version

Diffstat:
M
packaging/ng/buildconfig/taler-merchant.tag
 | 
2
+-
M
packaging/ng/buildscripts/generic
 | 
31
++++++++++++++++++++++++++++---
M
packaging/ng/taler-pkg
 | 
2
+-

3 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/packaging/ng/buildconfig/taler-merchant.tag b/packaging/ng/buildconfig/taler-merchant.tag
@@ -1 +1 @@
-v1.2.1
+v1.2.2
diff --git a/packaging/ng/buildscripts/generic b/packaging/ng/buildscripts/generic
@@ -25,6 +25,16 @@ def get_output(cmd, shell=False, cwd=None):
     """Helper to get command output as string."""
     return subprocess.check_output(cmd, shell=shell, cwd=cwd, text=True).strip()
 
+def make_version(deb_version, build_codename):
+    if "-" in deb_version:
+        # We already have a dash, thus a debian version.
+        # Append out build_codename to that.
+        return f"{deb_version}+{build_codename}"
+    # We don't have a debian version yet, start at zero, because by convention,
+    # real / manually created debian release versions start at 1.
+    return f"{deb_version}-0+{build_codename}"
+
+
 def main():
     # unset LD_LIBRARY_PATH
     if 'LD_LIBRARY_PATH' in os.environ:
@@ -103,6 +113,21 @@ def main():
     
     os.environ["DEB_BUILD_MAINT_OPTIONS"] = "debug"
 
+    # Add a codename-specific tag to the package.
+    # We need this tag as reprepro doesn't support multiple packages (even for
+    # different codenames like trixie/bookworm) per repo.
+    # Examples of how it should work:
+    # 1.2.3 => 1.2.3-0~trixie
+    # 1.2.3-2 => 1.2.3-2~trixie
+    # What we must not do:
+    # WRONG: 1.2.3 => 1.2.3~trixie
+    # Because 1.2.3~trixie <= 1.2.3, version requirements in dependencies would
+    # not work.
+
+    out_deb_version = make_version(DEB_VERSION, CODENAME)
+
+    print(f"Building {PACKAGE} as version {out_deb_version}", file=sys.stderr)
+
     # Add distro/codename specific version trailer
     if CODENAME:
         env_vars = {
@@ -110,9 +135,9 @@ def main():
             "NAME": "Taler Packaging Team"
         }
         run_cmd([
-            "dch", "-b", 
-            "--distribution", "unstable", 
-            "--newversion", f"{DEB_VERSION}~{CODENAME}", 
+            "dch", "-b",
+            "--distribution", "unstable",
+            "--newversion", out_deb_version,
             f"Build for {CODENAME}"
         ], env=env_vars)
 
diff --git a/packaging/ng/taler-pkg b/packaging/ng/taler-pkg
@@ -26,7 +26,7 @@ components = [
     "gnunet",
     "libeufin",
     # Temporarily disabled due to versioning issues
-    # "donau",
+    "donau",
     "challenger",
     "taler-exchange",
     "taler-harness",