commit acdf30d01a5555c252fd657c425dafee628e3fd1
parent 4693be62b1b73045c62da1e1bfb0689b47a69409
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Mon, 14 Apr 2025 10:43:55 +0200
update to git urls, readd doxygen
Diffstat:
| M | buildbot/master.cfg | | | 71 | ++++++++++++++++++++++++++++++++++------------------------------------- |
1 file changed, 34 insertions(+), 37 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -441,7 +441,7 @@ WORKERS.append(Worker("schanzen-aarch64-fedora-meson", "eWi9keet"))
SCHEDULERS.append(schedulers.AnyBranchScheduler(
name="gnunet",
change_filter=util.ChangeFilter(branch_re='master',
- repository='https://git.gnunet.org/gnunet.git'),
+ repository='git://git.gnunet.org/gnunet.git'),
treeStableTimer=None,
builderNames=["gnunet-debian-x86_64",
"gnunet-debian-x86_64-autotools",
@@ -450,7 +450,7 @@ SCHEDULERS.append(schedulers.AnyBranchScheduler(
SCHEDULERS.append(schedulers.AnyBranchScheduler(
name="gnunet-dev",
change_filter=util.ChangeFilter(branch_re='dev/.+',
- repository='https://git.gnunet.org/gnunet.git'),
+ repository='git://git.gnunet.org/gnunet.git'),
treeStableTimer=None,
builderNames=["gnunet-debian-x86_64-dev",
"gnunet-fedora-aarch64-dev"]))
@@ -458,7 +458,7 @@ SCHEDULERS.append(schedulers.AnyBranchScheduler(
SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="tagged_release",
change_filter=util.ChangeFilter(branch_re='.*v[0-9]*[.][0-9]*[.][0-9]*$',
- repository='https://git.gnunet.org/gnunet.git'),
+ repository='git://git.gnunet.org/gnunet.git'),
treeStableTimer=None,
builderNames=["gnunet_release"]))
@@ -466,7 +466,7 @@ SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="tarball",
onlyImportant=True,
change_filter=util.ChangeFilter(branch='master',
- repository='https://git.gnunet.org/gnunet.git'),
+ repository='git://git.gnunet.org/gnunet.git'),
fileIsImportant=checkForTarballTrigger,
treeStableTimer=None,
builderNames=["gnunet_release"]))
@@ -475,7 +475,7 @@ SCHEDULERS.append(schedulers.SingleBranchScheduler(
# Build a tarball nightly
SCHEDULERS.append(schedulers.Nightly(name='nightly',
change_filter=util.ChangeFilter(branch='master',
- repository='https://git.gnunet.org/gnunet.git'),
+ repository='git://git.gnunet.org/gnunet.git'),
builderNames=['gnunet_release'],
onlyIfChanged=True,
hour=6, minute=0))
@@ -484,7 +484,7 @@ SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="gnunet_cov",
onlyImportant=True,
change_filter=util.ChangeFilter(branch='master',
- repository='https://git.gnunet.org/gnunet.git'),
+ repository='git://git.gnunet.org/gnunet.git'),
fileIsImportant=checkForCoverityTrigger,
treeStableTimer=None,
builderNames=["gnunet_coverity"]))
@@ -492,7 +492,7 @@ SCHEDULERS.append(schedulers.SingleBranchScheduler(
SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="gnunet_rpm",
change_filter=util.ChangeFilter(branch='dev/schanzen/copr',
- repository='https://git.gnunet.org/gnunet-rpm.git'),
+ repository='git://git.gnunet.org/gnunet-rpm.git'),
treeStableTimer=None,
builderNames=["gnunet_rpm_copr"]))
@@ -500,7 +500,7 @@ SCHEDULERS.append(schedulers.SingleBranchScheduler(
# Schedule a coverity pass monthly
SCHEDULERS.append(schedulers.Nightly(name='nightly_cov',
change_filter=util.ChangeFilter(branch='master',
- repository='https://git.gnunet.org/gnunet.git'),
+ repository='git://git.gnunet.org/gnunet.git'),
builderNames=['gnunet_coverity'],
onlyIfChanged=True,
dayOfMonth=0, hour=3, minute=0))
@@ -514,50 +514,50 @@ SCHEDULERS.append(schedulers.Nightly(name='nightly_cov',
SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="www_master_scheduler",
change_filter=util.ChangeFilter(branch='master',
- repository='https://git.gnunet.org/www.git'),
+ repository='git://git.gnunet.org/www.git'),
treeStableTimer=None,
builderNames=["stage.gnunet.org"]))
SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="www_stable_scheduler",
change_filter=util.ChangeFilter(branch='stable',
- repository='https://git.gnunet.org/www.git'),
+ repository='git://git.gnunet.org/www.git'),
treeStableTimer=None,
builderNames=["www.gnunet.org"]))
SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="bib_scheduler",
change_filter=util.ChangeFilter(branch='master',
- repository='https://git.gnunet.org/gnunetbib.git'),
+ repository='git://git.gnunet.org/gnunetbib.git'),
treeStableTimer=None,
builderNames=["bib.gnunet.org"]))
SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="reclaim_www_scheduler",
change_filter=util.ChangeFilter(branch='master',
- repository='https://git.gnunet.org/www-reclaim.git'),
+ repository='git://git.gnunet.org/www-reclaim.git'),
treeStableTimer=None,
builderNames=["reclaim.gnunet.org"]))
SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="rest_scheduler",
change_filter=util.ChangeFilter(branch='master',
- repository='https://git.gnunet.org/gnunet-rest-api.git'),
+ repository='git://git.gnunet.org/gnunet-rest-api.git'),
treeStableTimer=None,
builderNames=["rest.gnunet.org"]))
SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="lsd_scheduler",
change_filter=util.ChangeFilter(branch='master',
- repository_re='https://git.gnunet.org/lsd.*'),
+ repository_re='git://git.gnunet.org/lsd.*'),
treeStableTimer=None,
builderNames=["lsd.gnunet.org"]))
SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="gana_scheduler",
change_filter=util.ChangeFilter(branch='master',
- repository='https://git.gnunet.org/gana.git'),
+ repository='git://git.gnunet.org/gana.git'),
treeStableTimer=None,
builderNames=["gana.gnunet.org"]))
SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="doc_scheduler",
change_filter=util.ChangeFilter(branch='master',
- repository='https://git.gnunet.org/gnunet-handbook.git'),
+ repository='git://git.gnunet.org/gnunet-handbook.git'),
treeStableTimer=None,
builderNames=["doc.gnunet.org"]))
@@ -568,7 +568,7 @@ SCHEDULERS.append(schedulers.SingleBranchScheduler(
SCHEDULERS.append(schedulers.SingleBranchScheduler(
name="bb_reload_scheduler",
change_filter=util.ChangeFilter(branch='master',
- repository='https://git.gnunet.org/buildbot-ci.git'),
+ repository='git://git.gnunet.org/buildbot-ci.git'),
treeStableTimer=None,
builderNames=["buildbot"]))
@@ -646,7 +646,7 @@ gnunet_meson_step = steps.ShellSequence(
)
gnunet_meson_build_steps = [
- steps.Git(repourl='https://git.gnunet.org/gnunet.git',
+ steps.Git(repourl='git://git.gnunet.org/gnunet.git',
mode='full', method='fresh'),
gnunet_meson_step
]
@@ -654,7 +654,7 @@ gnunet_meson_build_steps = [
factoryMeson.addSteps(gnunet_meson_build_steps)
gnunet_build_steps = [
- steps.Git(repourl='https://git.gnunet.org/gnunet.git',
+ steps.Git(repourl='git://git.gnunet.org/gnunet.git',
mode='full', method='fresh'),
gnunet_make_step
]
@@ -662,17 +662,14 @@ gnunet_build_steps = [
factory.addSteps(gnunet_build_steps)
# The factory with doc deployment (only for firely)
-factoryWithDocs.addSteps(gnunet_build_steps)
+factoryWithDocs.addSteps(gnunet_meson_build_steps)
# Add the deployment step
-factoryWithDocs.addStep(steps.ShellCommand(command=['make', 'full'],
- workdir=util.Interpolate('build/doc/doxygen'),
+factoryWithDocs.addStep(steps.ShellCommand(command=['meson', 'compile',
+ '-C', 'build',
+ 'doxygen'],
haltOnFailure=True,
name="Doxygen"))
-factoryWithDocs.addStep(steps.ShellCommand(command=['make', 'html'],
- workdir=util.Interpolate('build/doc'),
- haltOnFailure=True,
- name="HTML Documentation"))
factoryWithDocs.addStep(steps.ShellSequence(
name=util.Interpolate("Deploy Doxygen"),
@@ -683,7 +680,7 @@ factoryWithDocs.addStep(steps.ShellSequence(
haltOnFailure=True),
util.ShellArg(command=['rsync', '-a', '--delete',
'--exclude', 'sphinx',
- '../doc/',
+ '../doc/doxygen',
'handbook@firefly.gnunet.org:~/doc_deployment/'],
logname='Deploy',
haltOnFailure=True),
@@ -695,7 +692,7 @@ factoryWithDocs.addStep(steps.ShellSequence(
# Occurs: 1st day of month #
############################
cov_factory = util.BuildFactory()
-cov_factory.addStep(steps.Git(repourl='https://git.gnunet.org/gnunet.git', mode='full', method='fresh'))
+cov_factory.addStep(steps.Git(repourl='git://git.gnunet.org/gnunet.git', mode='full', method='fresh'))
cov_factory.addStep(steps.ShellSequence(
name=util.Interpolate("Git rev. %(prop:got_revision)s build"),
env={'PATH': "${HOME}/.local/bin:$HOME/bin:${PATH}"},
@@ -730,7 +727,7 @@ cov_factory.addStep(steps.ShellCommand(command=['curl',
#################################################
dist_factory = util.BuildFactory()
# https://github.com/buildbot/buildbot/issues/6539 change to "copy" when fixed
-dist_factory.addStep(steps.Git(repourl='https://git.gnunet.org/gnunet.git', mode='full', method='clobber'))
+dist_factory.addStep(steps.Git(repourl='git://git.gnunet.org/gnunet.git', mode='full', method='clobber'))
# We do meson first, because autotools changes the source...
# There seems to be a meson bug where it thinks that the source was changed.
@@ -883,21 +880,21 @@ copr_factory.addStep(steps.ShellCommand(command=["curl",
# stage.gnunet.org #
###########################
www_factory = util.BuildFactory()
-www_factory.addStep(steps.Git(repourl='https://git.gnunet.org/www.git', mode='incremental'))
+www_factory.addStep(steps.Git(repourl='git://git.gnunet.org/www.git', mode='incremental'))
add_default_pipeline(www_factory)
###########################
# www.gnunet.org #
###########################
www_stable_factory = util.BuildFactory()
-www_stable_factory.addStep(steps.Git(repourl='https://git.gnunet.org/www.git', mode='incremental', branch='stable'))
+www_stable_factory.addStep(steps.Git(repourl='git://git.gnunet.org/www.git', mode='incremental', branch='stable'))
add_default_pipeline(www_stable_factory)
###########################
# bib.gnunet.org #
###########################
bib_factory = util.BuildFactory()
-bib_factory.addStep(steps.Git(repourl='https://git.gnunet.org/gnunetbib.git', mode='incremental'))
+bib_factory.addStep(steps.Git(repourl='git://git.gnunet.org/gnunetbib.git', mode='incremental'))
add_default_pipeline(bib_factory)
@@ -905,7 +902,7 @@ add_default_pipeline(bib_factory)
# reclaim.gnunet.org #
###########################
reclaim_www_stable_factory = util.BuildFactory()
-reclaim_www_stable_factory.addStep(steps.Git(repourl='https://git.gnunet.org/www-reclaim.git', mode='incremental', branch='master'))
+reclaim_www_stable_factory.addStep(steps.Git(repourl='git://git.gnunet.org/www-reclaim.git', mode='incremental', branch='master'))
add_default_pipeline(reclaim_www_stable_factory)
@@ -913,7 +910,7 @@ add_default_pipeline(reclaim_www_stable_factory)
# rest.gnunet.org #
###########################
rest_factory = util.BuildFactory()
-rest_factory.addStep(steps.Git(repourl='https://git.gnunet.org/gnunet-rest-api.git', mode='incremental', branch='master'))
+rest_factory.addStep(steps.Git(repourl='git://git.gnunet.org/gnunet-rest-api.git', mode='incremental', branch='master'))
add_default_pipeline(rest_factory)
###########################
@@ -927,14 +924,14 @@ add_default_pipeline(lsd_factory)
# gana.gnunet.org #
###########################
gana_factory = util.BuildFactory()
-gana_factory.addStep(steps.Git(repourl='https://git.gnunet.org/gana.git', mode='full', method="fresh", branch='master'))
+gana_factory.addStep(steps.Git(repourl='git://git.gnunet.org/gana.git', mode='full', method="fresh", branch='master'))
add_default_pipeline(gana_factory)
##############################
# doc.gnunet.org (Doc-NG) #
##############################
doc_factory = util.BuildFactory()
-doc_factory.addStep(steps.Git(repourl='https://git.gnunet.org/gnunet-handbook.git', alwaysUseLatest=True, mode='full', method="clobber", branch='master'))
+doc_factory.addStep(steps.Git(repourl='git://git.gnunet.org/gnunet-handbook.git', alwaysUseLatest=True, mode='full', method="clobber", branch='master'))
add_default_pipeline(doc_factory)
@@ -956,7 +953,7 @@ BUILDERS.append(
BUILDERS.append(
util.BuilderConfig(name="gnunet-debian-x86_64",
workernames=["firefly-x86_64-amdepyc"],
- factory=factoryMeson))
+ factory=factoryWithDocs))
BUILDERS.append(
util.BuilderConfig(name="gnunet-fedora-aarch64",
