<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-infrastructure.
</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/03677cd5a083dfae9fc0508ec42cb3f9cd877a46">https://github.com/macports/macports-infrastructure/commit/03677cd5a083dfae9fc0508ec42cb3f9cd877a46</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 03677cd5a083dfae9fc0508ec42cb3f9cd877a46
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Tue Jun 27 01:13:31 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> buildbot: Add job to update man.macports.org
</span>---
buildbot/config.json.sample | 7 ++++++
buildbot/master.cfg | 52 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/buildbot/config.json.sample b/buildbot/config.json.sample
</span><span style='display:block; white-space:pre;color:#808080;'>index 99b5b0d..9907348 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/buildbot/config.json.sample
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/buildbot/config.json.sample
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +24,13 @@
</span> "sshkeyfile": "",
"sshknownhostsfile": "ssh_known_hosts",
"destpath": ""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "man": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "host": "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "user": "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "sshkeyfile": "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "sshknownhostsfile": "ssh_known_hosts",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "destpath": ""
</span> }
}
}
<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 102517b..a0a379d 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;'>@@ -269,6 +269,22 @@ if 'guide' in config['deploy']:
</span> builderNames=['jobs-guide'])
))
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if 'man' in config['deploy']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c['schedulers'].extend((
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ schedulers.SingleBranchScheduler(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name='man',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ treeStableTimer=300,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ change_filter=util.ChangeFilter(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ repository=config['baseurl'][:-4],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FIXME: determine the current stable version or use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # a special branch name instead of harcoding a version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ branch='release-2.4'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ builderNames=['jobs-man']),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ schedulers.ForceScheduler(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name='man_force',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ builderNames=['jobs-man'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if 'portindex' in config['deploy']:
c['schedulers'].extend((
schedulers.SingleBranchScheduler(
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -672,6 +688,34 @@ if 'guide' in config['deploy']:
</span> srcpath='guide/guide/html/',
destpath=config['deploy']['guide']['destpath'])))
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if 'man' in config['deploy']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jobs_man_factory = util.BuildFactory()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: incremental mode with cleanup?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jobs_man_factory.addStep(steps.Git(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ repourl=config['baseurl'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ progress=True,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mode='full',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ method='copy'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jobs_man_factory.addStep(steps.Configure(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command="./standard_configure.sh",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ logfiles={'config.log': 'config.log'}))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: check for existence of tools in toolsprefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jobs_man_factory.addStep(steps.ShellCommand(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command='make -C doc html',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name='make',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['generate man pages'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['generated man pages'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env={'PATH': path_jobs}))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jobs_man_factory.addSteps(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make_ssh_deploy_step(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sshkeyfile=config['deploy']['man']['sshkeyfile'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sshknownhostsfile=config['deploy']['man']['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']['man']['host'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ user=config['deploy']['man']['user'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ srcpath='doc/*.html',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destpath=config['deploy']['man']['destpath'])))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
####### BUILDER CONFIGURATION #######
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -742,6 +786,14 @@ if 'guide' in config['deploy']:
</span> factory=jobs_guide_factory,
tags=['jobs', 'docs', 'guide'],
env=merge_dicts(env_buildinfo, {'PATH': path_jobs})))
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if 'man' in config['deploy']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c['builders'].append(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ util.BuilderConfig(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name='jobs-man',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ slavenames=['jobs'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ factory=jobs_man_factory,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tags=['jobs', 'docs', 'man'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env=merge_dicts(env_buildinfo, {'PATH': path_jobs})))
</span> if 'mirror' in config['deploy']:
c['builders'].append(
util.BuilderConfig(
</pre><pre style='margin:0'>
</pre>