gnunet-svn
[Top][All Lists]
Advanced

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

[taler-deployment] branch master updated: -remove buywith for now


From: gnunet
Subject: [taler-deployment] branch master updated: -remove buywith for now
Date: Mon, 13 Jan 2025 23:50:47 +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 0eaff37  -remove buywith for now
0eaff37 is described below

commit 0eaff37281b021b499e32e4580d2402fb201bbad
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Jan 13 23:50:45 2025 +0100

    -remove buywith for now
---
 buildbot/make-buildbot-containerworker.sh | 5 ++++-
 buildbot/make-buildbot-linkchecker.sh     | 7 +++++--
 buildbot/make-buildbot-master.sh          | 2 ++
 buildbot/make-buildbot-sitesworker.sh     | 9 +++++++--
 buildbot/master.cfg                       | 6 +++---
 worker-sites/Makefile                     | 6 +-----
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/buildbot/make-buildbot-containerworker.sh 
b/buildbot/make-buildbot-containerworker.sh
index b380951..9879b92 100755
--- a/buildbot/make-buildbot-containerworker.sh
+++ b/buildbot/make-buildbot-containerworker.sh
@@ -15,6 +15,9 @@ pip install --user --break-system-packages buildbot-worker
 
 mkdir -p workspace
 
-if [[ ! -d worker ]]; then
+if [[ ! -d worker ]];
+then
   buildbot-worker create-worker --umask=0o22 ~/worker 127.0.0.1:9988 
container-worker container-pass
+  echo $HOSTNAME > worker/info/host
+  echo "GNUnet.org admins <admin@gnunet.org>" > worker/info/admin
 fi
diff --git a/buildbot/make-buildbot-linkchecker.sh 
b/buildbot/make-buildbot-linkchecker.sh
index 5a26278..d7aabdd 100755
--- a/buildbot/make-buildbot-linkchecker.sh
+++ b/buildbot/make-buildbot-linkchecker.sh
@@ -20,6 +20,9 @@ then
     git clone git://git.taler.net/taler-deployment.git
 fi
 
-if [[ ! -d worker ]]; then
-  buildbot-worker create-worker --umask=0o22 ~/worker 127.0.0.1:9988 
linkchecker-worker linkchecker-pass
+if [[ ! -d worker ]];
+then
+    buildbot-worker create-worker --umask=0o22 ~/worker 127.0.0.1:9988 
linkchecker-worker linkchecker-pass
+    echo $HOSTNAME > worker/info/host
+    echo "GNUnet.org admins <admin@gnunet.org>" > worker/info/admin
 fi
diff --git a/buildbot/make-buildbot-master.sh b/buildbot/make-buildbot-master.sh
index 85152aa..d1040ff 100755
--- a/buildbot/make-buildbot-master.sh
+++ b/buildbot/make-buildbot-master.sh
@@ -43,4 +43,6 @@ fi
 if [[ ! -d worker ]];
 then
   buildbot-worker create-worker --umask=0o22 ~/worker 127.0.0.1:9988 
buildmaster-worker buildmaster-pass
+   echo $HOSTNAME > worker/info/host
+   echo "GNUnet.org admins <admin@gnunet.org>" > worker/info/admin
 fi
diff --git a/buildbot/make-buildbot-sitesworker.sh 
b/buildbot/make-buildbot-sitesworker.sh
index 2fff8d2..64e5778 100755
--- a/buildbot/make-buildbot-sitesworker.sh
+++ b/buildbot/make-buildbot-sitesworker.sh
@@ -13,12 +13,15 @@ export PATH=$HOME/.local/bin:$PATH
 
 pip install --user --break-system-packages buildbot-worker
 
-if [[ ! -d worker ]]; then
+if [[ ! -d worker ]];
+then
   buildbot-worker create-worker --umask=0o22 ~/worker 127.0.0.1:9988 
sites-worker sites-pass
+  echo $HOSTNAME > worker/info/host
+  echo "GNUnet.org admins <admin@gnunet.org>" > worker/info/admin
 fi
 
 BRANCH=master
-REPOS="www twister buywith"
+REPOS="taler-www twister"
 
 cd $HOME
 
@@ -43,4 +46,6 @@ ln -sf ../deployment/worker-sites/invalidate.sh stamps/
 if [[ ! -d worker ]];
 then
   buildbot-worker create-worker --umask=0o22 ~/worker localhost:9988 
sites-worker sites-pass
+  echo $HOSTNAME > worker/info/host
+  echo "GNUnet.org admins <admin@gnunet.org>" > worker/info/admin
 fi
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 98c2166..cbb290b 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -308,16 +308,16 @@ BUILDERS.append(util.BuilderConfig(
 #EMAIL_ALERTS.append("sites-builder")
 
 
-# The web page changed if 'taler-www' changed
+# The web page changed if 'taler-www' or 'twister' changed
 def web_page(change):
     _change = change.asDict()
     repo = _change.get("project")
-    if repo in ["taler-www", "taler-deployment"]:
+    if repo in ["taler-www", "twister", "taler-deployment"]:
         return True
     return False
 
 
-# Sites are re-build whenever deployment, www buywith, or twister changes.
+# Sites are re-build whenever taler-deployment, taler-www, or twister changes.
 SCHEDULERS.append(schedulers.SingleBranchScheduler(
     name="sites-scheduler",
     builderNames=["sites-builder"],
diff --git a/worker-sites/Makefile b/worker-sites/Makefile
index 1da4762..4eff9ce 100644
--- a/worker-sites/Makefile
+++ b/worker-sites/Makefile
@@ -1,6 +1,6 @@
 BASE="${HOME}/deployment/worker-sitesbuild"
 
-all: www.taler.net-stamp twister.taler.net-stamp stage.taler.net-stamp 
buywith.taler.net-stamp
+all: www.taler.net-stamp twister.taler.net-stamp stage.taler.net-stamp
 
 stage.taler.net-stamp:
        ${BASE}/update_stage.sh
@@ -13,7 +13,3 @@ www.taler.net-stamp:
 twister.taler.net-stamp:
        ${BASE}/update_twister_page.sh
        touch $@
-
-buywith.taler.net-stamp:
-       ${BASE}/update_buywith_page.sh
-       touch $@

-- 
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]