[taler-merchant] branch master updated: lockfile for merchant SPA from prebuilt

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 10bc0e6a lockfile for merchant SPA from prebuilt
10bc0e6a is described below

commit 10bc0e6ae1e19e98a8c45e75f0517666eee62e3a
Author: Florian Dold <florian@dold.me>
AuthorDate: Mon Jun 10 17:02:51 2024 +0200

    lockfile for merchant SPA from prebuilt
---
 bootstrap                 |  7 +++++++
 contrib/check-prebuilt    | 15 +++++++++++++++
 contrib/merchant-spa.lock |  1 +
 contrib/wallet-core       |  2 +-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/bootstrap b/bootstrap
index 18789981..3321d906 100755
--- a/bootstrap
+++ b/bootstrap
@@ -7,9 +7,16 @@ if ! git --version >/dev/null; then
   exit 1
 fi
 
+if ! python3 --version >/dev/null; then
+  echo "python3 not installed"
+  exit 1
+fi
+
 echo "$0: Updating submodules"
 echo | git submodule update --init --force --remote
 
+./contrib/check-prebuilt
+
 
 # This is more portable than `which' but comes with
 # the caveat of not(?) properly working on busybox's ash:
diff --git a/contrib/check-prebuilt b/contrib/check-prebuilt
new file mode 100755
index 00000000..ed8ec0e8
--- /dev/null
+++ b/contrib/check-prebuilt
@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+
+contrib = os.path.abspath(os.path.dirname(__file__))
+
+merchant_spa_ver_lock = open(contrib + "/" + 
"merchant-spa.lock").read().strip()
+merchant_spa_ver_prebuilt = open(contrib + "/" + 
"wallet-core/backoffice/version.txt").read().strip()
+
+if merchant_spa_ver_lock != merchant_spa_ver_prebuilt:
+    print("merchant SPA version mismatch")
+    print("lockfile has version", merchant_spa_ver_lock)
+    print("prebuilt has version", merchant_spa_ver_prebuilt)
+    sys.exit(1)
diff --git a/contrib/merchant-spa.lock b/contrib/merchant-spa.lock
new file mode 100644
index 00000000..1a96df19
--- /dev/null
+++ b/contrib/merchant-spa.lock
@@ -0,0 +1 @@
+0.11.3
diff --git a/contrib/wallet-core b/contrib/wallet-core
index f9b0af55..ce923bfb 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit f9b0af55874c1d49e3c04fd8a64ed10a7236a558
+Subproject commit ce923bfba1bbbca7e52e1ef0b166a47376f91364

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.