<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/990ec67282b9214fc5385fb56362d2c47b2b7d22">https://github.com/macports/macports-infrastructure/commit/990ec67282b9214fc5385fb56362d2c47b2b7d22</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 990ec67  buildbot: more configurability for archive deployment
</span>990ec67 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 990ec67282b9214fc5385fb56362d2c47b2b7d22
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Mar 4 02:56:47 2025 +1100

<span style='display:block; white-space:pre;color:#404040;'>    buildbot: more configurability for archive deployment
</span>---
 buildbot/master.cfg | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 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 e425fe4..2c5f22e 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;'>@@ -91,6 +91,7 @@ config = {
</span>     'archivesiteprivate': 'https://packages-private.macports.org',
     'privkey': '',
     'deploy': {},
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    'deploy_archives': False,
</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;'>@@ -444,18 +445,33 @@ class SetPropertyFromCommandWithPortlist(steps.SetPropertyFromCommand):
</span> # because archives must be built with prefix=/opt/local
 if config['production']:
     prefix = '/opt/local'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    dlhost = 'packages@packages-origin.macports.org'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    dlhost_private = dlhost
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    dlpath = '/var/www/html/packages'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    dlpath_private = '/var/www/html/packages-private'
</span> else:
     prefix = config['slaveprefix']
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    dlhost = ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if 'dlhost' in config:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    dlhost = config['dlhost']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    dlhost = 'packages@packages-origin.macports.org' if config['production'] else ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if 'dlhost_private' in config:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    dlhost_private = config['dlhost_private']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else:
</span>     dlhost_private = dlhost
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    dlpath = './deployed_archives'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    dlpath_private = './deployed_archives_private'
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ulpath = 'archive_staging'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if 'dlpath' in config:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    dlpath = config['dlpath']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    dlpath = '/var/www/html/packages' if config['production'] else './deployed_archives'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if 'dlpath_private' in config:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    dlpath_private = config['dlpath_private']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    dlpath_private = '/var/www/html/packages-private' if config['production'] else './deployed_archives_private'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if 'ulpath' in config:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ulpath = config['ulpath']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ulpath = 'archive_staging'
</span> ulpath_unique = ulpath+'-%(buildername)s'
 
 @util.renderer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -627,7 +643,7 @@ portbuilder_factory.addStep(steps.DirectoryUpload(
</span> 
 # XXX: move deploy_archives.sh functionality to mpbb
 # sign generated binaries and sync to download server (if distributable)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if config['production']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if config['production'] or config['deploy_archives']:
</span>     portbuilder_factory.addStep(steps.MasterShellCommand(
         command=['./deploy_archives.sh', util.WithProperties(os.path.join(ulpath_unique, 'public'))],
         name='deploy-archives',
</pre><pre style='margin:0'>

</pre>