diff options
author | Florian Dold <florian.dold@gmail.com> | 2017-06-06 14:38:48 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2017-06-06 14:38:48 +0200 |
commit | 4793388bf74f5eaa88fb8156b01f01801458575d (patch) | |
tree | 3e710f91e7149cd5d04cfa0fb57835d5ac77f354 | |
parent | 3dc9b91e16ccfaac81f2dc696d5ecf6ea7ddf34e (diff) | |
download | deployment-4793388bf74f5eaa88fb8156b01f01801458575d.tar.gz deployment-4793388bf74f5eaa88fb8156b01f01801458575d.tar.bz2 deployment-4793388bf74f5eaa88fb8156b01f01801458575d.zip |
Revert "no auditor repo anymore"
We still need the auditor repository to serve the auditor webpage.
This reverts commit ab61867c73a38d2019366726f293b3d3544db33a.
-rw-r--r-- | taler-build/Makefile | 6 | ||||
-rwxr-xr-x | taler-build/update_auditor.sh | 14 |
2 files changed, 19 insertions, 1 deletions
diff --git a/taler-build/Makefile b/taler-build/Makefile index 9995d63..5e9da9b 100644 --- a/taler-build/Makefile +++ b/taler-build/Makefile @@ -1,4 +1,4 @@ -all: exchange-stamp bank-stamp merchant-stamp gnunet-stamp merchant-frontends-stamp landing-stamp deployment-stamp +all: exchange-stamp bank-stamp merchant-stamp gnunet-stamp merchant-frontends-stamp landing-stamp deployment-stamp auditor-stamp deployment-stamp: ./update_deployment.sh @@ -9,6 +9,10 @@ exchange-stamp: gnunet-stamp deployment-stamp bank-stamp ./update_exchange.sh touch $@ +auditor-stamp: deployment-stamp + ./update_auditor.sh + touch $@ + landing-stamp: deployment-stamp ./update_landing.sh touch $@ diff --git a/taler-build/update_auditor.sh b/taler-build/update_auditor.sh new file mode 100755 index 0000000..35d7184 --- /dev/null +++ b/taler-build/update_auditor.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +set -eu + +cd $HOME/auditor +git clean -fxd + +git fetch +# reset to updated upstream branch, but only if we're tracking a branch +branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD) +git reset --hard "$branch" + +git submodule update --force --init +make |