diff options
-rwxr-xr-x | bootstrap-sitesbuilder | 2 | ||||
-rw-r--r-- | buildbot/master.cfg | 7 | ||||
-rwxr-xr-x | taler-sitesbuild/invalidate.sh | 10 | ||||
-rwxr-xr-x | taler-sitesbuild/update_doc_landing.sh | 41 |
4 files changed, 4 insertions, 56 deletions
diff --git a/bootstrap-sitesbuilder b/bootstrap-sitesbuilder index 16d937b..0aaffe1 100755 --- a/bootstrap-sitesbuilder +++ b/bootstrap-sitesbuilder @@ -9,7 +9,7 @@ set -eu BRANCH=master -REPOS="www docs-landing twister" +REPOS="www twister" cd $HOME diff --git a/buildbot/master.cfg b/buildbot/master.cfg index 8690acf..c1d387b 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -128,7 +128,7 @@ c["change_source"] = [ALLCS] def twister_web_page(change): _change = change.asDict() repo = _change.get("project") - if repo in ["www", "docs-landing"]: + if repo in ["www"]: return True files = _change.get("files") @@ -171,8 +171,7 @@ DOC_SCHEDULER = schedulers.SingleBranchScheduler( branch_re="(master|stable)", filter_fn=doc_filter, project_re="(backoffice|api|www|bank|exchange|merchant" - "|deployment|merchant-frontend-examples" - "|docs-landing)"), + "|deployment|merchant-frontend-examples)", treeStableTimer=None) @@ -183,7 +182,7 @@ SITES_SCHEDULER = schedulers.SingleBranchScheduler( branch_re="(master|stable)", # Given that filter_fn is used, the line below could be # removed (?) - project_re="(www|docs-landing|twister)", + project_re="(www|twister)", filter_fn=twister_web_page), treeStableTimer=None) diff --git a/taler-sitesbuild/invalidate.sh b/taler-sitesbuild/invalidate.sh index 6b83bdd..c8ff0f6 100755 --- a/taler-sitesbuild/invalidate.sh +++ b/taler-sitesbuild/invalidate.sh @@ -19,16 +19,6 @@ if git status -sb | grep behind; then rm -f $HOME/stamps/stage.taler.net-stamp fi - -# Check docs-landing. -cd $HOME/docs-landing -git fetch -if git status -sb | grep behind; then - echo "invalidating stage.taler.net" - rm -f $HOME/stamps/docs.taler.net-stamp - -fi - # Check Twister Web page. cd $HOME/twister git fetch diff --git a/taler-sitesbuild/update_doc_landing.sh b/taler-sitesbuild/update_doc_landing.sh deleted file mode 100755 index 547c783..0000000 --- a/taler-sitesbuild/update_doc_landing.sh +++ /dev/null @@ -1,41 +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/docs-landing/ -fetch -git submodule update --force --init - -# Get the MOs files. -make compile - -# Get the translated final HTMLs. -make translate - -# No compilation needed so far. -mkdir -p $HOME/docs.taler.net/ - -for page in `find en/ fr/ it/ es/ pt/ ru/ de/ -name "*.html"`; do - tidy -o $page $page || true ; -done - -cp -rt $HOME/docs.taler.net/ \ - en/ \ - fr/ \ - it/ \ - es/ \ - pt/ \ - ru/ \ - de/ \ - images/ \ - *.{css,svg} - -chmod -R g+rx $HOME/docs.taler.net/ |