From c6d43b1274c044c275f8dbea343aff33593a7485 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 6 Feb 2018 04:06:40 +0100 Subject: build docs the same way as blue/green --- buildbot/build-docs.sh | 14 ++++++++++++++ buildbot/master.cfg | 24 ++++-------------------- 2 files changed, 18 insertions(+), 20 deletions(-) create mode 100755 buildbot/build-docs.sh (limited to 'buildbot') diff --git a/buildbot/build-docs.sh b/buildbot/build-docs.sh new file mode 100755 index 0000000..92f5078 --- /dev/null +++ b/buildbot/build-docs.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +set -eu + +cd $HOME/deployment + +# like "git pull", but discard local changes +git fetch +git reset --hard FETCH_HEAD + +cd $HOME/deployment/taler-docbuild +./invalidate.sh + +make diff --git a/buildbot/master.cfg b/buildbot/master.cfg index 2ba4e4e..68761e8 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -266,32 +266,16 @@ SELENIUM_FACTORY.addStep(ShellCommand( command=["launch_selenium_test"], env={'PATH': "${HOME}/local/bin:/usr/lib/chromium:${PATH}"})) -def doc_dispatcher(project): - switch = { - "docs-landing": ["./update_doc_landing.sh"], - "api": ["./update_api.sh"], - "backoffice": ["./update_doc_backoffice.sh"], - "www": ["./update_www_and_stage.sh"], - "bank": ["./update_bank.sh"], - "merchant": ["./update_doc_merchant.sh"], - "exchange": ["./update_doc_exchange.sh"], - "merchant-frontend-examples": ["./update_tutorials.sh"], - "deployment": ["./update_onboarding.sh"], - "help": ["echo", "dispatcher", "debug"] - } - # Force schedules trigger the default. - return switch.get(project, "./update_api.sh") - DOC_FACTORY = util.BuildFactory() DOC_FACTORY.addStep(git_step( "git://git.taler.net/deployment.git")) DOC_FACTORY.addStep(ShellCommand( name="build docs", - description="Building documentation.", + description="Building documentation", descriptionDone="Documentation built.", - command=util.Transform(doc_dispatcher, - util.Property("project")), - workdir="build/taler-build")) + command=["./build-docs.sh"], + workdir="build/buildbot", + haltOnFailure=True)) DEBUG_BUILDER = util.BuilderConfig( name="debug-builder", -- cgit v1.2.3