diff options
| author | Florian Dold <florian.dold@gmail.com> | 2016-05-20 14:46:52 +0200 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2016-05-20 14:46:52 +0200 |
| commit | e55efcea6bbe6d652100bee19c14b9e366abf91b (patch) | |
| tree | fea0c68ef076700585168c044dec37d4454ef7a5 /taler-build/update_exchange.sh | |
| parent | 5cf9e76e20f2cab20c12a548172717b7f518f583 (diff) | |
| download | deployment-e55efcea6bbe6d652100bee19c14b9e366abf91b.tar.gz deployment-e55efcea6bbe6d652100bee19c14b9e366abf91b.tar.bz2 deployment-e55efcea6bbe6d652100bee19c14b9e366abf91b.zip | |
Make build system robust against force pushes
Diffstat (limited to 'taler-build/update_exchange.sh')
| -rwxr-xr-x | taler-build/update_exchange.sh | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/taler-build/update_exchange.sh b/taler-build/update_exchange.sh index 1e96119..aa8d617 100755 --- a/taler-build/update_exchange.sh +++ b/taler-build/update_exchange.sh @@ -1,25 +1,20 @@ #!/bin/bash -export PATH="$HOME/deployment":$PATH +set -eu -build_exchange() { - ( - set -eu +cd $HOME/exchange +git clean -fdx - cd $HOME/exchange - git clean -fdx - ./bootstrap - ./configure CFLAGS='-ggdb -O0' \ - --with-libgnurl=$HOME/local \ - --with-microhttpd=$HOME/local \ - --prefix=$HOME/local --with-gnunet=$HOME/local \ - --enable-logging=verbose - make - make install - ) -} +# like "git pull", but robust against force pushes +# and local changes +git fetch +git reset --hard FETCH_HEAD -cd $HOME/exchange && \ - git pull && \ - cd $HOME/deployment && \ - build_exchange +./bootstrap +./configure CFLAGS='-ggdb -O0' \ + --with-libgnurl=$HOME/local \ + --with-microhttpd=$HOME/local \ + --prefix=$HOME/local --with-gnunet=$HOME/local \ + --enable-logging=verbose +make +make install |