taler-rust

commit fb827402b44da29b7188f16285b5a5e95e200892
parent c54f6749015195116f85782cf9fb5936302a87a6
Author: Antoine A <>
Date:   Tue, 25 Nov 2025 10:35:37 +0100

common: improve ci

Diffstat:
M
contrib/ci/Containerfile
 | 
4
+---
M
contrib/ci/ci.sh
 | 
2
++
M
contrib/ci/deb-test.sh
 | 
2
--
T
contrib/ci/jobs/5-deb-arm64/job.sh
 | 
0

M
contrib/taler-magnet-bank-dbconfig
 | 
13
++++++-------

5 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile
@@ -1,8 +1,6 @@
 FROM docker.io/library/debian:trixie
 
-ENV DEBIAN_FRONTEND=noninteractive \
-    # Persistent cargo cache
-    CARGO_HOME=/workdir/.ci
+ENV DEBIAN_FRONTEND=noninteractive
     
     # Apt sync
 RUN apt-get update -yq && \
diff --git a/contrib/ci/ci.sh b/contrib/ci/ci.sh
@@ -26,6 +26,8 @@ fi
 	--arch "${JOB_ARCH}" \
 	--env CI_COMMIT_REF="$(git rev-parse HEAD)" \
 	--volume "${PWD}":/workdir \
+	--volume "${HOME}/.cargo/git:/root/.cargo/git" \
+	--volume "${HOME}/.cargo/registry:/root/.cargo/registry" \
 	--workdir /workdir \
 	"${JOB_CONTAINER}" \
 	contrib/ci/jobs/"${JOB_NAME}"/job.sh
diff --git a/contrib/ci/deb-test.sh b/contrib/ci/deb-test.sh
@@ -1,7 +1,5 @@
 set -eu
 
-ARCH=$(dpkg --print-architecture)
-
 function step() {
     echo -e "\n$@" >&2
 }
diff --git a/contrib/ci/jobs/5-deb-arm64/job.sh b/contrib/ci/jobs/5-deb-arm64/job.sh
diff --git a/contrib/taler-magnet-bank-dbconfig b/contrib/taler-magnet-bank-dbconfig
@@ -139,13 +139,12 @@ if [ 0 = "$SKIP_INIT" ] || [ 1 = "$FORCE_PERMS" ]; then
   if ! sudo -i -u postgres createuser "$DBGROUP" 2>/dev/null; then
     echo "Database group '$DBGROUP' already existed. Continuing anyway." 1>&2
   fi
-  if ! echo "GRANT ALL ON SCHEMA magnet_bank TO \"$DBGROUP\"" |
-    sudo -i -u postgres psql "$DBNAME"; then
-    exit_fail "Failed to grant access to '$DBGROUP'."
-  fi
-  if ! echo "GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA magnet_bank TO \"$DBGROUP\"" |
-    sudo -i -u postgres psql "$DBNAME"; then
-    exit_fail "Failed to grant access to '$DBGROUP'."
+  if ! sudo -i -u postgres psql "$DBNAME" <<-EOF
+    GRANT ALL ON SCHEMA magnet_bank TO "$DBGROUP";
+    GRANT SELECT ON ALL TABLES IN SCHEMA magnet_bank TO "$DBGROUP";
+EOF
+  then
+      exit_fail "Failed to grant access to '$DBGROUP'."
   fi
 
   # Update group users rights