donau

commit c32652505209b20821ea0ef72d4b40c8dd582370
parent 8a64a4b30805eeddb9b78b6448792d20f21d6d6f
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Wed,  8 Apr 2026 16:32:51 +0200

attempt to fix CI pipe

Diffstat:
M
contrib/ci/Containerfile
 | 
8
+++++---
M
contrib/ci/jobs/2-test/test.sh
 | 
2
+-
M
contrib/ci/jobs/4-deb-package/job.sh
 | 
24
+-----------------------
M
debian/changelog
 | 
17
+++++++++++++++++
M
src/donau/test_donau_httpd.conf
 | 
3
+++

5 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile
@@ -23,7 +23,6 @@ RUN apt-get update -yqq && \
 		   python3-pip \
 		   python3-sphinx \
 		   python3-sphinx-rtd-theme \
-                   recutils \
                    texinfo \
 		   zlib1g-dev
 
@@ -32,6 +31,7 @@ RUN apt-get install -yqq \
                    po-debconf \
                    build-essential \
                    debhelper-compat \
+                   git-buildpackage \
                    devscripts
 
 # Documentation dependencies
@@ -47,8 +47,8 @@ RUN apt-get install -yqq \
                    wget
 
 # Install Taler (and friends) packages
-RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \
-    | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources
+RUN curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \
+    | tee /etc/apt/sources.list.d/taler-trixie-ci.sources
 
 RUN echo '\
 Package: * \n\
@@ -61,6 +61,8 @@ RUN cat /etc/apt/preferences.d/taler && \
                    libgnunet-dev \
                    libgnunet \
                    gnunet \
+                   libtalerexchange \
+                   libtalerexchange-dev \
 && rm -rf /var/lib/apt/lists/*
 
 
diff --git a/contrib/ci/jobs/2-test/test.sh b/contrib/ci/jobs/2-test/test.sh
@@ -9,7 +9,7 @@ make
 make install
 
 PG_BIN="$(pg_config --bindir)"
-PG_ETC="$(pg_config --sharedir | sed 's|/share/postgresql|/etc/postgresql|")
+PG_ETC="$(pg_config --sharedir | sed 's|/usr/share/postgresql|/etc/postgresql|')"
 sudo -u postgres "${PG_BIN}/postgres" -D ${PG_ETC}/main -h localhost -p 5432 &
 
 sleep 10
diff --git a/contrib/ci/jobs/4-deb-package/job.sh b/contrib/ci/jobs/4-deb-package/job.sh
@@ -1,24 +1,2 @@
 #!/bin/bash
-set -exuo pipefail
-# This file is in the public domain.
-# Helper script to build the latest DEB packages in the container.
-
-unset LD_LIBRARY_PATH
-
-
-git apply ./ci/jobs/2-deb-package/install-fix.patch
-
-# Get current version from debian/control file.
-DEB_VERSION=$(dpkg-parsechangelog -S Version)
-
-# Install build-time dependencies.
-mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control
-
-# We do a sparse checkout, so we need to hint
-# the version to the build system.
-echo $DEB_VERSION > .version
-./bootstrap
-dpkg-buildpackage -rfakeroot -b -uc -us
-
-ls ../*.deb
-mv ../*.deb /artifacts/
+exec ./contrib/ci/debian-package-job.sh
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,20 @@
+donau (1.5.2) UNRELEASED; urgency=medium
+
+  [ Christian Grothoff ]
+  * make build more compatible with MHD2
+  * rename donau handlers for consistency
+  * fix ECs/HTTP status codes to match specifications
+
+  [ Martin Schanzenbach ]
+  * move ci to contrib
+  * add ci.sh
+  * add config ini
+  * fix codespell
+  * spelling
+  * trixie
+
+ -- root <none>  Wed, 08 Apr 2026 14:25:27 +0000
+
 donau (1.5.1) unstable; urgency=low
 
   * Release 1.5.1.
diff --git a/src/donau/test_donau_httpd.conf b/src/donau/test_donau_httpd.conf
@@ -3,6 +3,9 @@
 DONAU_TEST_HOME = test_donau_httpd_home/
 DONAU_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/donau-system-runtime/
 
+[exchange]
+BASE_URL = http://localhost:8888/
+
 [donau]
 # Currency supported by the Donau (can only be one)
 CURRENCY = EUR