sandcastle-ng

commit a1e36d963b12fdad9928f548edb4dc4dd95eb7c2
parent 891b52c2fdfa25643f2651e5c9514a195ae47ccc
Author: Florian Dold <florian@dold.me>
Date:   Thu, 30 Oct 2025 11:47:30 +0100

fix db import order, bump component versions

Diffstat:
M
buildconfig/merchant-demos.tag
 | 
2
+-
M
scripts/demo/setup-sandcastle.sh
 | 
22
+++++++++++-----------

2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/buildconfig/merchant-demos.tag b/buildconfig/merchant-demos.tag
@@ -1 +1 @@
-v1.1.0-dev.1
+v1.1.0-dev.2
diff --git a/scripts/demo/setup-sandcastle.sh b/scripts/demo/setup-sandcastle.sh
@@ -457,8 +457,18 @@ while true; do
   esac
 done
 
+backup_file=/exported/postgres-backup.sql
+if [[ $import_instr = singledump ]]; then
+  echo "Importing database dump"
+  if [[ ! -e "$backup_file" ]]; then
+    echo "Requested import, but backup file does not exist" >&2
+    exit 1
+  fi
+  sudo -u postgres psql postgres -f "$backup_file"
+fi
+
 # Set up databases.
-# Do that *before* we potentially do a restore-from-backup.
+# Do that *before* we potentially do a per-service restore-from-backup.
 
 challenger-dbconfig
 
@@ -513,16 +523,6 @@ if [[ $import_instr = all ]]; then
   cp -r /exported/taler-exchange/secmod-cs/* /var/lib/taler-exchange/secmod-cs/
 fi
 
-backup_file=/exported/postgres-backup.sql
-if [[ $import_instr = singledump ]]; then
-  echo "Importing database dump"
-  if [[ ! -e "$backup_file" ]]; then
-    echo "Requested import, but backup file does not exist" >&2
-    exit 1
-  fi
-  sudo -u postgres psql postgres -f "$backup_file"
-fi
-
 if [[ $import_instr != none ]]; then
   echo "Marking import as done"
   rm /exported/import-request