taler-deployment

commit d48b3d00a3e7063ab058df8b476028f0aec82474
parent 40e5ed510270fc4dfb5814c4dc8120db9c740f52
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Fri,  1 Mar 2019 16:40:50 +0100

Addressing #5424.

Diffstat:
M
buildbot/master.cfg
 | 
2
+-
M
taler-docbuild/Makefile
 | 
5
+++--
A
taler-docbuild/update_stage.sh
 | 
16
++++++++++++++++
A
taler-docbuild/update_www.sh
 | 
16
++++++++++++++++
D
taler-docbuild/update_www_and_stage.sh
 | 
21
---------------------

5 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -82,7 +82,7 @@ DOC_SCHEDULER = schedulers.SingleBranchScheduler(
     name="periodic-doc-scheduler",
     builderNames=["doc-builder"],
     change_filter=util.ChangeFilter(
-        branch="master",
+        branch="master|stable",
         filter_fn=doc_filter,
         project_re="backoffice|api|www|bank|exchange|merchant"
                    "|help|deployment|merchant-frontend-examples"
diff --git a/taler-docbuild/Makefile b/taler-docbuild/Makefile
@@ -39,9 +39,10 @@ deployment-stamp:
 	touch $@
 
 stage.taler.net-stamp:
-	./update_www_and_stage.sh
+	./update_stage.sh
 	touch $@
 
+# Cares about the 'stable' branch.
 www.taler.net-stamp:
-	./update_www_and_stage.sh
+	./update_www.sh
 	touch $@
diff --git a/taler-docbuild/update_stage.sh b/taler-docbuild/update_stage.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -eu
+
+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/stage.taler.net
+fetch
+git submodule update --init --force
+make
diff --git a/taler-docbuild/update_www.sh b/taler-docbuild/update_www.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -eu
+
+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/www.taler.net
+fetch
+git submodule update --init --force
+make
diff --git a/taler-docbuild/update_www_and_stage.sh b/taler-docbuild/update_www_and_stage.sh
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-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/stage.taler.net
-fetch
-git submodule update --init --force
-make
-
-cd $HOME/www.taler.net
-fetch
-git submodule update --init --force
-make