<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/3e457cf373841fb4400454f4686e78e5c80b2bdc">https://github.com/macports/macports-infrastructure/commit/3e457cf373841fb4400454f4686e78e5c80b2bdc</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 3e457cf  buildbot: adjust rsync upload method
</span>3e457cf is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 3e457cf373841fb4400454f4686e78e5c80b2bdc
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Mar 4 06:28:19 2025 +1100

<span style='display:block; white-space:pre;color:#404040;'>    buildbot: adjust rsync upload method
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Don't use make_ssh_deploy_step since downloading the ssh key via an
</span><span style='display:block; white-space:pre;color:#404040;'>    unsecured FileDownload step undermines the point of this upload method.
</span>---
 buildbot/master.cfg | 7 ++-----
 1 file changed, 2 insertions(+), 5 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 f66ceb4..0486351 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;'>@@ -677,14 +677,11 @@ if config['upload_method'] == 'buildbot':
</span>         slavesrc=ulpath,
         masterdest=util.WithProperties(ulpath_unique)))
 elif config['upload_method'] == 'rsync':
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    portbuilder_factory.addStep(make_ssh_deploy_step(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        sshkeyfile=config['deploy']['archives']['sshkeyfile'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        sshknownhostsfile=config['deploy']['archives']['sshknownhostsfile'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        step=RsyncDeployStep(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    portbuilder_factory.addStep(RsyncDeployStep(
</span>             host=config['deploy']['archives']['host'],
             user=config['deploy']['archives']['user'],
             srcpath=ulpath,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            destpath=util.WithProperties(ulpath_unique))))
</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>