exchange

commit 45cc578e67e8aab2caf9f34e63e00b9a490cd8ee
parent c304d40f96bb7b8d2111a76a4fc21a9ee6ae4c6f
Author: Özgür Kesim <oec-taler@kesim.org>
Date:   Wed, 20 Dec 2023 13:59:07 +0100

[ci] use podman only; make -j(#cpu/2)

Diffstat:
M
contrib/ci/ci.sh
 | 
5
++---
M
contrib/ci/jobs/1-build/build.sh
 | 
2
++
A
contrib/ci/jobs/1-build/config.ini
 | 
2
++
M
contrib/ci/jobs/2-test/config.ini
 | 
2
+-
M
contrib/ci/jobs/2-test/test.sh
 | 
4
+++-
M
contrib/ci/jobs/3-docs/config.ini
 | 
2
+-

6 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/contrib/ci/ci.sh b/contrib/ci/ci.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 set -exvuo pipefail
 
-# Use podman if available, otherwise use docker.
-# Fails if neither is found in PATH
-OCI_RUNTIME=$(which podman || which docker)
+# Use podman, fails if it isn't found in PATH
+OCI_RUNTIME=$(which podman)
 REPO_NAME=$(basename "${PWD}")
 JOB_NAME="${1}"
 JOB_CONTAINER=$((grep CONTAINER_NAME contrib/ci/jobs/${JOB_NAME}/config.ini | cut -d' ' -f 3) || echo "${REPO_NAME}")
diff --git a/contrib/ci/jobs/1-build/build.sh b/contrib/ci/jobs/1-build/build.sh
@@ -9,4 +9,6 @@ apt-get upgrade -yqq
 	    --enable-logging=verbose \
 	    --disable-doc
 
+nump=$(grep processor /proc/cpuinfo | wc -l)
+make -j$(( $nump / 2 ))
 make
diff --git a/contrib/ci/jobs/1-build/config.ini b/contrib/ci/jobs/1-build/config.ini
@@ -0,0 +1,2 @@
+[build]
+CONTAINER_NAME = localhost/exchange
diff --git a/contrib/ci/jobs/2-test/config.ini b/contrib/ci/jobs/2-test/config.ini
@@ -2,5 +2,5 @@
 HALT_ON_FAILURE = False
 WARN_ON_FAILURE = True
 CONTAINER_BUILD = True
-CONTAINER_NAME = exchange
+CONTAINER_NAME = localhost/exchange
 CONTAINER_ARCH = amd64
diff --git a/contrib/ci/jobs/2-test/test.sh b/contrib/ci/jobs/2-test/test.sh
@@ -8,7 +8,9 @@ apt-get upgrade -yqq
 ./configure CFLAGS="-ggdb -O0" \
 	    --enable-logging=verbose \
 	    --disable-doc
-make
+
+nump=$(grep processor /proc/cpuinfo | wc -l)
+make -j$(( $nump / 2 ))
 make install
 
 sudo -u postgres /usr/lib/postgresql/15/bin/postgres -D /etc/postgresql/15/main -h localhost -p 5432 &
diff --git a/contrib/ci/jobs/3-docs/config.ini b/contrib/ci/jobs/3-docs/config.ini
@@ -2,5 +2,5 @@
 HALT_ON_FAILURE = False
 WARN_ON_FAILURE = True
 CONTAINER_BUILD = True
-CONTAINER_NAME = exchange
+CONTAINER_NAME = localhost/exchange
 CONTAINER_ARCH = amd64