From d48b3d00a3e7063ab058df8b476028f0aec82474 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <stanisci.m@gmail.com>
Date: Fri, 1 Mar 2019 16:40:50 +0100
Subject: Addressing #5424.

---
 buildbot/master.cfg                    |  2 +-
 taler-docbuild/Makefile                |  5 +++--
 taler-docbuild/update_stage.sh         | 16 ++++++++++++++++
 taler-docbuild/update_www.sh           | 16 ++++++++++++++++
 taler-docbuild/update_www_and_stage.sh | 21 ---------------------
 5 files changed, 36 insertions(+), 24 deletions(-)
 create mode 100755 taler-docbuild/update_stage.sh
 create mode 100755 taler-docbuild/update_www.sh
 delete mode 100755 taler-docbuild/update_www_and_stage.sh

diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index e770cf2..2c49867 100644
--- 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
index 92f4379..4c286e3 100644
--- 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
new file mode 100755
index 0000000..3f7f585
--- /dev/null
+++ 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
new file mode 100755
index 0000000..b4912d3
--- /dev/null
+++ 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
deleted file mode 100755
index a57c889..0000000
--- a/taler-docbuild/update_www_and_stage.sh
+++ /dev/null
@@ -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
-- 
cgit v1.2.3