taler-deployment

commit 16854b3fea5cc3996980573c5d0807948fccabc7
parent 4380ba34975fed0e0210c51db9ad1722abed2f8e
Author: Florian Dold <florian.dold@gmail.com>
Date:   Thu, 29 Aug 2019 14:10:38 +0200

doc builder

Diffstat:
M
buildbot/build-docs.sh
 | 
15
++++++++++++---
D
taler-docbuild/Makefile
 | 
7
-------
D
taler-docbuild/README
 | 
2
--
D
taler-docbuild/invalidate.sh
 | 
14
--------------

4 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/buildbot/build-docs.sh b/buildbot/build-docs.sh
@@ -2,7 +2,16 @@
 
 set -eu
 
-cd ~/deployment/taler-docbuild
+fetch () {
+  git clean -fdx
+  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"
+}
+
+cd $HOME/deployment
+fetch
 
-./invalidate.sh
-make all
+cd ~/deployment/taler-docbuild
+./update_docs.sh
diff --git a/taler-docbuild/Makefile b/taler-docbuild/Makefile
@@ -1,7 +0,0 @@
-BASE="${HOME}/deployment/taler-docbuild"
-
-all: docs-stamp
-
-docs-stamp:
-	${BASE}/update_docs.sh
-	touch $@
diff --git a/taler-docbuild/README b/taler-docbuild/README
@@ -1,2 +0,0 @@
-Makefile for all taler components, using one timestamp
-file in this folder to represent each component.
diff --git a/taler-docbuild/invalidate.sh b/taler-docbuild/invalidate.sh
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-components="bank merchant exchange deployment backoffice api merchant-frontend-examples"
-
-for component in $components ; do
-  cd $HOME/$component
-  git fetch
-  if git status -sb | grep behind; then
-    echo "invalidating $component"
-    rm -f $HOME/stamps/$component-stamp
-  fi
-done