<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-infrastructure.

</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/a58d5aa896a48f140378f1d7a111a26f6a5b399f">https://github.com/macports/macports-infrastructure/commit/a58d5aa896a48f140378f1d7a111a26f6a5b399f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new a58d5aa  buildbot: add rsync archive upload method
</span>a58d5aa is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a58d5aa896a48f140378f1d7a111a26f6a5b399f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Mar 4 04:23:03 2025 +1100

<span style='display:block; white-space:pre;color:#404040;'>    buildbot: add rsync archive upload method
</span>---
 buildbot/master.cfg | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/buildbot/master.cfg b/buildbot/master.cfg
</span><span style='display:block; white-space:pre;color:#808080;'>index 2c5f22e..bcca5e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/buildbot/master.cfg
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/buildbot/master.cfg
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,6 +92,7 @@ config = {
</span>     'privkey': '',
     'deploy': {},
     'deploy_archives': False,
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    'upload_method': 'buildbot',
</span> 
     # Site definitions
     # (http://docs.buildbot.net/0.8.12/manual/cfg-global.html#site-definitions)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -636,10 +637,20 @@ portbuilder_factory.addStep(steps.ShellCommand(
</span>     descriptionDone=['gather', 'archives'],
     haltOnFailure=True))
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# upload archives from build slave to master
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-portbuilder_factory.addStep(steps.DirectoryUpload(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    slavesrc=ulpath,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    masterdest=util.WithProperties(ulpath_unique)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if config['upload_method'] == 'buildbot':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # upload archives from build slave to master
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    portbuilder_factory.addStep(steps.DirectoryUpload(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        slavesrc=ulpath,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        masterdest=util.WithProperties(ulpath_unique)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+elif config['upload_method'] == 'rsync':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    portbuilder_factory.addStep(make_ssh_deploy_step(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        sshkeyfile=config['deploy']['archives']['sshkeyfile'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        sshknownhostsfile=config['deploy']['archives']['sshknownhostsfile'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        step=RsyncDeployStep(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            host=config['deploy']['archives']['host'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            user=config['deploy']['archives']['user'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            srcpath=ulpath,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            destpath=util.WithProperties(ulpath_unique))))
</span> 
 # XXX: move deploy_archives.sh functionality to mpbb
 # sign generated binaries and sync to download server (if distributable)
</pre><pre style='margin:0'>

</pre>