taler-deployment

commit a24c23d3bc3c9cdd25fd62a7490e0beaed7dd688
parent c065e0c35434246bc23d74714a5fe5f2c8ae667a
Author: Florian Dold <florian@dold.me>
Date:   Tue,  2 Sep 2025 17:03:15 +0200

bump versions, also upload ddebs

Diffstat:
M
packaging/ng/buildconfig/taler-exchange.tag
 | 
2
+-
M
packaging/ng/buildscripts/generic.sh
 | 
5
++++-
M
packaging/ng/taler-pkg
 | 
20
+++++++++++++++++++-

3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/packaging/ng/buildconfig/taler-exchange.tag b/packaging/ng/buildconfig/taler-exchange.tag
@@ -1 +1 @@
-v1.0.21
+v1.0.23
diff --git a/packaging/ng/buildscripts/generic.sh b/packaging/ng/buildscripts/generic.sh
@@ -71,10 +71,13 @@ cp ../*.deb /pkgdir/
 cp ../*.ddeb /pkgdir/ &> /dev/null || true
 
 # Save current deb file names for this package.
-echo >/pkgdir/$PACKAGE.built.current
+truncate -s0 /pkgdir/$PACKAGE.built.current
 for deb in ../*.deb; do
   echo $(basename $deb) >>/pkgdir/$PACKAGE.built.current
 done
+for deb in ../*.ddeb; do
+  echo $(basename $deb) >>/pkgdir/$PACKAGE.built.current
+done
 
 # Now do some basic tests to check the packages actually work
 
diff --git a/packaging/ng/taler-pkg b/packaging/ng/taler-pkg
@@ -256,6 +256,7 @@ def publish(cfg):
         print("Files are automatically published to testing", file=sys.stderr)
         sys.exit(1)
     vendor, codename = distro.split("-", 1)
+    # List of .deb and .ddeb files.
     debs = []
     listfmt = "${package}_${version}_${architecture}.deb\n"
     server_debs_str = subprocess.check_output(
@@ -276,7 +277,12 @@ def publish(cfg):
         with open(f"./packages/{distro}/{component}.built.current") as f:
             current = f.read().split()
         for deb in current:
-            pkg1, ver1, arch1 = deb.removesuffix(".deb").split("_")
+            if deb.endswith(".deb"):
+                pkg1, ver1, arch1 = deb.removesuffix(".deb").split("_")
+            elif deb.endswith(".ddeb"):
+                pkg1, ver1, arch1 = deb.removesuffix(".ddeb").split("_")
+            else:
+                raise Error(f"invalid deb filename: {deb}")
             fresh = True
             server_deb = None
             # If the server has the same or a later version,
@@ -322,6 +328,18 @@ def publish(cfg):
         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")
+        # almost the same, but with ddebs
+        ret = subprocess.run(
+            [
+                "ssh",
+                "-t",
+                f"taler-packaging@{host}",
+                f"reprepro -b /home/taler-packaging/www/apt/{vendor}/ includedeb {codename}-testing ~/{vendor}-{codename}/*.ddeb",
+            ],
+        )
+        if ret.returncode != 0:
+            # Usually not critical if it fails.
+            print("Including ddebs failed. This can happen when including packages that have been included previously")
     # Always export!
     # Reprepro is weird, listed packages might actually not show
     # up in the index yet.