diff options
author | Florian Dold <florian@dold.me> | 2023-07-31 10:52:34 +0200 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2023-07-31 10:52:34 +0200 |
commit | 3923530608d02130841f6daa2c2d07155655ac80 (patch) | |
tree | 1a17523de6ed73326dd7998b1a9764fb626a0a12 | |
parent | dc81d01304e3cf93c4ae86ab8c11fa778aff583f (diff) | |
download | exchange-3923530608d02130841f6daa2c2d07155655ac80.tar.xz |
make sure gana files are built from pinned submodule
Previously the bootstrap script would always pull and build
from the latest gana.git master, which led to unreproducible
builds, and broke building older tags of the exchange from git when
gana did a breaking change.
-rwxr-xr-x | bootstrap | 3 | ||||
-rw-r--r-- | contrib/Makefile.am | 2 | ||||
-rwxr-xr-x | contrib/gana-generate.sh (renamed from contrib/gana-update.sh) | 0 | ||||
-rwxr-xr-x | contrib/gana-latest.sh (renamed from contrib/gana.sh) | 2 |
4 files changed, 4 insertions, 3 deletions
@@ -18,7 +18,8 @@ fi echo "$0: Updating submodules" echo | git submodule update --init -./contrib/gana.sh +# Generate based on pinned submodule +./contrib/gana-generate.sh # This is more portable than `which' but comes with # the caveat of not(?) properly working on busybox's ash: diff --git a/contrib/Makefile.am b/contrib/Makefile.am index f8e0a8ebf..fb4165fa2 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -49,7 +49,7 @@ EXTRA_DIST = \ taler-bank-manage-testing \ taler-nexus-prepare \ taler-terms-generator.in \ - gana-update.sh \ + gana-generate.sh \ gana/gnu-taler-error-codes/registry.rec \ gana/gnu-taler-error-codes/Makefile \ $(terms_DATA) \ diff --git a/contrib/gana-update.sh b/contrib/gana-generate.sh index 4679e2003..4679e2003 100755 --- a/contrib/gana-update.sh +++ b/contrib/gana-generate.sh diff --git a/contrib/gana.sh b/contrib/gana-latest.sh index 30dc7994e..e92761acc 100755 --- a/contrib/gana.sh +++ b/contrib/gana-latest.sh @@ -7,4 +7,4 @@ cd contrib/gana git pull origin master cd ../.. -exec ./contrib/gana-update.sh +exec ./contrib/gana-generate.sh |