libeufin

commit 0e8ec5eccb09dec59b7f02c81e6dcab370a08ed6
parent 1bb13f2318f89312542d5cfa723e4049d7afde3e
Author: Antoine A <>
Date:   Sat,  8 Feb 2025 15:59:33 +0100

common: improve CI and improve deb dependencies

Diffstat:
M
Makefile
 | 
4
++++
M
contrib/ci/jobs/2-test/test.sh
 | 
10
++++------
A
contrib/ci/run-all-jobs.sh
 | 
5
+++++
M
debian/control
 | 
10
+++++-----

4 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
@@ -122,6 +122,10 @@ doc:
 	./gradlew dokkaHtmlMultiModule
 	echo "Open build/dokka/htmlMultiModule/index.html"
 
+.PHONY: ci
+ci:
+	contrib/ci/run-all-jobs.sh
+
 .PHONY: bank-bench-db
 bank-bench-db: install-nobuild-files
 	./gradlew cleanTest :bank:test --tests Bench.benchDb -i --no-build-cache
diff --git a/contrib/ci/jobs/2-test/test.sh b/contrib/ci/jobs/2-test/test.sh
@@ -8,15 +8,13 @@ apt-get upgrade -yqq
 ./configure --prefix /usr
 make build
 
-sudo -u postgres /usr/lib/postgresql/15/bin/postgres -D /etc/postgresql/15/main -h localhost -p 5432 &
-sleep 10
-sudo -u postgres createuser -p 5432 root
-sudo -u postgres createdb -p 5432 -O root libeufincheck
-# TODO run test as non root user to check permission errors in CI
+sudo -u postgres pg_ctlcluster 15 main start
+sudo -u postgres createuser root --superuser
+sudo -u postgres createdb -O root libeufincheck
 
 check_command()
 {
-	PGPORT=5432 make check &> test-suite.log
+	make check &> test-suite.log
 }
 
 if ! check_command ; then
diff --git a/contrib/ci/run-all-jobs.sh b/contrib/ci/run-all-jobs.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -eax
+for JOB in $(ls $(dirname $0)/jobs | sort -n); do
+  $(dirname $0)/ci.sh $JOB;
+done;
diff --git a/debian/control b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Christian Grothoff <grothoff@gnu.org>, Florian Dold <dold@taler.net>
 Build-Depends:
  debhelper-compat (= 12),
  unzip,
- openjdk-17-jdk-headless | openjdk-17-jdk | openjdk-18-jdk-headless | openjdk-18-jdk | openjdk-19-jdk-headless | openjdk-19-jdk | openjdk-20-jdk-headless | openjdk-20-jdk | openjdk-21-jdk-headless | openjdk-21-jdk
+ default-jdk-headless | java-runtime-headless (>= 17)
 Standards-Version: 4.1.0
 Vcs-Git: https://git.taler.net/libeufin.git
 Homepage: https://taler.net/
@@ -19,21 +19,21 @@ Description: Common files for other libeufin packages.
 Package: libeufin-bank
 Architecture: all
 Depends:
- openjdk-17-jdk-headless | openjdk-17-jdk | openjdk-18-jdk-headless | openjdk-18-jdk | openjdk-19-jdk-headless | openjdk-19-jdk | openjdk-20-jdk-headless | openjdk-20-jdk | openjdk-21-jdk-headless | openjdk-21-jdk,
+ default-jre-headless | java-runtime-headless (>= 17),
  libeufin-common (= ${binary:Version}),
  ${misc:Depends}
 Recommends:
  apache2 | nginx | httpd,
- postgresql (>= 13.0)
+ postgresql (>= 14.0)
 Description: Software package to provide a regional bank with optional EBICS access.
 
 Package: libeufin-nexus
 Architecture: all
 Depends:
- openjdk-17-jdk-headless | openjdk-17-jdk | openjdk-18-jdk-headless | openjdk-18-jdk | openjdk-19-jdk-headless | openjdk-19-jdk | openjdk-20-jdk-headless | openjdk-20-jdk | openjdk-21-jdk-headless | openjdk-21-jdk,
+ default-jre-headless | java-runtime-headless (>= 17),
  libeufin-common (= ${binary:Version}),
  ${misc:Depends}
 Recommends:
  apache2 | nginx | httpd,
- postgresql (>= 13.0)
+ postgresql (>= 14.0)
 Description: Software package to access a bank accounts via the EBICS protocol.