[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated: integrate auditor SPA
From: |
gnunet |
Subject: |
[taler-exchange] branch master updated: integrate auditor SPA |
Date: |
Fri, 23 Aug 2024 10:15:37 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository exchange.
The following commit(s) were added to refs/heads/master by this push:
new cc5c8a53c integrate auditor SPA
cc5c8a53c is described below
commit cc5c8a53c873473f4d5bc5d96d14806aaa6149ff
Author: Florian Dold <florian@dold.me>
AuthorDate: Fri Aug 23 10:15:34 2024 +0200
integrate auditor SPA
---
.gitignore | 1 +
contrib/.gitignore | 2 ++
contrib/aml-spa.lock | 2 +-
contrib/auditor-spa.lock | 1 +
contrib/check-prebuilt | 13 +++++++++++--
contrib/wallet-core | 2 +-
doc/prebuilt | 2 +-
7 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index bce08c4ea..b192823fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -181,3 +181,4 @@ src/testing/*/master.priv
/debian/taler-terms-generator/**
/debian/taler-terms-generator/*
release-artifacts
+test-suite.log
diff --git a/contrib/.gitignore b/contrib/.gitignore
index 1e74d37e2..90df41c57 100644
--- a/contrib/.gitignore
+++ b/contrib/.gitignore
@@ -1,3 +1,5 @@
locale/**/*.pot
Makefile.am
Makefile.am.ext
+*.log
+*.trs
diff --git a/contrib/aml-spa.lock b/contrib/aml-spa.lock
index 0de787f58..a31499ef5 100644
--- a/contrib/aml-spa.lock
+++ b/contrib/aml-spa.lock
@@ -1 +1 @@
-0.12.9
+0.12.12
diff --git a/contrib/auditor-spa.lock b/contrib/auditor-spa.lock
new file mode 100644
index 000000000..a31499ef5
--- /dev/null
+++ b/contrib/auditor-spa.lock
@@ -0,0 +1 @@
+0.12.12
diff --git a/contrib/check-prebuilt b/contrib/check-prebuilt
index 05ec4f15b..a85dcd264 100755
--- a/contrib/check-prebuilt
+++ b/contrib/check-prebuilt
@@ -6,6 +6,9 @@ import sys
failed = False
contrib = os.path.abspath(os.path.dirname(__file__))
+auditor_spa_ver_lock = open(contrib + "/" + "auditor-spa.lock").read().strip()
+auditor_spa_ver_prebuilt = open(contrib + "/" +
"wallet-core/auditor-backoffice/version.txt").read().strip()
+
aml_spa_ver_lock = open(contrib + "/" + "aml-spa.lock").read().strip()
aml_spa_ver_prebuilt = open(contrib + "/" +
"wallet-core/aml-backoffice/version.txt").read().strip()
@@ -13,16 +16,22 @@ kyc_spa_ver_lock = open(contrib + "/" +
"kyc-spa.lock").read().strip()
kyc_spa_ver_prebuilt = open(contrib + "/" +
"wallet-core/kyc/version.txt").read().strip()
if aml_spa_ver_lock != aml_spa_ver_prebuilt:
- print("AML SPA version mismatch")
+ print("AML SPA version mismatch (contrib/aml-spa.lock)")
print("lockfile has version", aml_spa_ver_lock)
print("prebuilt has version", aml_spa_ver_prebuilt)
failed = True
if kyc_spa_ver_lock != kyc_spa_ver_prebuilt:
- print("KYC SPA version mismatch")
+ print("KYC SPA version mismatch (contrib/kyc-spa.lock)")
print("lockfile has version", kyc_spa_ver_lock)
print("prebuilt has version", kyc_spa_ver_prebuilt)
failed = True
+if auditor_spa_ver_lock != auditor_spa_ver_prebuilt:
+ print("auditor SPA version mismatch (contrib/auditor-spa.lock)")
+ print("lockfile has version", auditor_spa_ver_lock)
+ print("prebuilt has version", auditor_spa_ver_prebuilt)
+ failed = True
+
if failed:
sys.exit(1)
diff --git a/contrib/wallet-core b/contrib/wallet-core
index e78b41204..c9a7b17cf 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit e78b4120493e89d836b0a87473eea572ad6c2bbd
+Subproject commit c9a7b17cfd2947cb09d2e7d5fba6d2cb0399057f
diff --git a/doc/prebuilt b/doc/prebuilt
index c1a885ac1..ab2e09b5a 160000
--- a/doc/prebuilt
+++ b/doc/prebuilt
@@ -1 +1 @@
-Subproject commit c1a885ac1f9d9b2fdef19a976bed01dab4f7d852
+Subproject commit ab2e09b5a3711ab04f1f77f79158cc006cab3195
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-exchange] branch master updated: integrate auditor SPA,
gnunet <=