<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/d4fa0bca0de66e22db218044b6d72952a91b533c">https://github.com/macports/macports-infrastructure/commit/d4fa0bca0de66e22db218044b6d72952a91b533c</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 d4fa0bc  buildbot: define make_ssh_deploy_step earlier
</span>d4fa0bc is described below

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

<span style='display:block; white-space:pre;color:#404040;'>    buildbot: define make_ssh_deploy_step earlier
</span>---
 buildbot/master.cfg | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 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 824062f..47a3c54 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;'>@@ -603,6 +603,26 @@ def make_portwatcher_factory(triggerable):
</span> 
     return portwatcher_factory
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+def make_ssh_deploy_step(sshkeyfile, sshknownhostsfile, step):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    return (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        steps.FileDownload(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            name='ssh key',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            description=['transferring'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            descriptionDone=['transfer'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            mastersrc=sshkeyfile,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            slavedest='ssh_key',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            mode=0600),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        steps.FileDownload(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            name='ssh known_hosts',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            description=['transferring'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            descriptionDone=['transfer'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            mastersrc=sshknownhostsfile,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            slavedest='ssh_known_hosts',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            mode=0600),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        step)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # -- Port Builder --
 
 portbuilder_factory = util.BuildFactory()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -701,25 +721,6 @@ class PostgresDeployStep(steps.ShellCommand):
</span>                 **kwargs)
 
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-def make_ssh_deploy_step(sshkeyfile, sshknownhostsfile, step):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    return (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        steps.FileDownload(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            name='ssh key',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            description=['transferring'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            descriptionDone=['transfer'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            mastersrc=sshkeyfile,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            slavedest='ssh_key',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            mode=0600),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        steps.FileDownload(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            name='ssh known_hosts',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            description=['transferring'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            descriptionDone=['transfer'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            mastersrc=sshknownhostsfile,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            slavedest='ssh_known_hosts',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            mode=0600),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        step)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> class CDNPurgeStep(steps.MasterShellCommand):
     # XXX: Ensure py*-requests-oauthlib is available
 
</pre><pre style='margin:0'>

</pre>