gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-deployment] branch master updated: add tutorials to worker-sites


From: gnunet
Subject: [taler-deployment] branch master updated: add tutorials to worker-sites
Date: Tue, 14 Jan 2025 23:14:57 +0100

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository taler-deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 464172b  add tutorials to worker-sites
464172b is described below

commit 464172b2189121c591294480dc719fdd9034b45b
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Jan 14 23:14:55 2025 +0100

    add tutorials to worker-sites
---
 buildbot/make-buildbot-sitesworker.sh |  4 ++--
 buildbot/master.cfg                   |  7 +++----
 worker-sites/Makefile                 |  6 +++++-
 worker-sites/invalidate.sh            | 10 ++++++++++
 worker-sites/update_tutorials.sh      | 28 ++++++++++++++++++++++++++++
 5 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/buildbot/make-buildbot-sitesworker.sh 
b/buildbot/make-buildbot-sitesworker.sh
index 15df218..86244ff 100755
--- a/buildbot/make-buildbot-sitesworker.sh
+++ b/buildbot/make-buildbot-sitesworker.sh
@@ -11,7 +11,7 @@ fi
 
 export PATH=$HOME/.local/bin:$PATH
 
-pip install --user --break-system-packages buildbot-worker
+pip install --user --break-system-packages buildbot-worker sphinxcontrib.video
 
 if [[ ! -d worker ]];
 then
@@ -21,7 +21,7 @@ then
 fi
 
 BRANCH=master
-REPOS="taler-www twister taler-docs"
+REPOS="taler-www twister taler-docs taler-tutorials"
 
 cd $HOME
 
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index cbb290b..a42cb84 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -308,11 +308,12 @@ BUILDERS.append(util.BuilderConfig(
 #EMAIL_ALERTS.append("sites-builder")
 
 
-# The web page changed if 'taler-www' or 'twister' changed
+# The web page changed if 'taler-www', 'taler-tutorials',
+# 'taler-docs' or 'twister' changed
 def web_page(change):
     _change = change.asDict()
     repo = _change.get("project")
-    if repo in ["taler-www", "twister", "taler-deployment"]:
+    if repo in ["taler-docs", "taler-tutorials", "taler-www", "twister", 
"taler-deployment"]:
         return True
     return False
 
@@ -506,7 +507,6 @@ class GenerateStagesCommand(buildstep.ShellMixin, 
steps.BuildStep):
 container_repos = ["git.gnunet.org/gnunet",
                    "git.taler.net/anastasis-www",
                    "git.taler.net/challenger",
-                   "git.taler.net/docs",
                    "git.taler.net/exchange",
                    "git.taler.net/libeufin",
                    "git.taler.net/merchant",
@@ -515,7 +515,6 @@ container_repos = ["git.gnunet.org/gnunet",
                    "git.taler.net/taler-android",
                    "git.taler.net/taler-ops-www",
                    "git.taler.net/taler-systems-www",
-                   "git.taler.net/tutorials",
                    "git.taler.net/wallet-core",]
 
 for repo in container_repos:
diff --git a/worker-sites/Makefile b/worker-sites/Makefile
index d51413b..0b24d50 100644
--- a/worker-sites/Makefile
+++ b/worker-sites/Makefile
@@ -1,6 +1,6 @@
 BASE="${HOME}/taler-deployment/worker-sites"
 
-all: www.taler.net-stamp twister.taler.net-stamp stage.taler.net-stamp 
docs.taler.net-stamp
+all: www.taler.net-stamp twister.taler.net-stamp stage.taler.net-stamp 
docs.taler.net-stamp tutorials.taler.net-stamp
 
 stage.taler.net-stamp:
        ${BASE}/update_stage.sh
@@ -10,6 +10,10 @@ docs.taler.net-stamp:
        ${BASE}/update_docs.sh
        touch $@
 
+tutorials.taler.net-stamp:
+       ${BASE}/update_tutorials.sh
+       touch $@
+
 www.taler.net-stamp:
        ${BASE}/update_www.sh
        touch $@
diff --git a/worker-sites/invalidate.sh b/worker-sites/invalidate.sh
index fc13781..47e8a8e 100755
--- a/worker-sites/invalidate.sh
+++ b/worker-sites/invalidate.sh
@@ -39,3 +39,13 @@ then
   echo "invalidating docs.taler.net"
   rm -f $HOME/stamps/docs.taler.net-stamp
 fi
+
+
+# Check taler-tutorials Web page.
+cd $HOME/taler-tutorials
+git fetch
+if git status -sb | grep behind;
+then
+  echo "invalidating tutorials.taler.net"
+  rm -f $HOME/stamps/tutorials.taler.net-stamp
+fi
diff --git a/worker-sites/update_tutorials.sh b/worker-sites/update_tutorials.sh
new file mode 100644
index 0000000..42830ac
--- /dev/null
+++ b/worker-sites/update_tutorials.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+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"
+}
+
+# Assumes the repo was already checked out once.
+cd $HOME/taler-tutorials
+
+git checkout master -f
+fetch
+git submodule update --init --force
+make html
+mv _build/html/ $HOME/tutorials.taler.net.wip
+
+chmod -R g+rx $HOME/tutorials.taler.net.wip/
+
+# Clean up 'ancient' version (before previous)
+rm -rf $HOME/tutorials.taler.net.old/
+# Finally, do two fast renames to make the current version active
+mv $HOME/tutorials.taler.net/ $HOME/tutorials.taler.net.old/ || true
+mv $HOME/tutorials.taler.net.wip/ $HOME/tutorials.taler.net/

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]