commit 5db7ef90321e3ce4df68a1e7d580f584edd35c8a
parent 6b83c0c9578ad7a10c4c9700015612f27fdc9b26
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Mon, 14 Apr 2025 11:27:00 +0200
no more autotools on release dist; move doxygen to release build
Diffstat:
| M | buildbot/master.cfg | | | 113 | ++++++++++++++++++++----------------------------------------------------------- |
1 file changed, 28 insertions(+), 85 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -665,28 +665,6 @@ factory.addSteps(gnunet_build_steps)
# The factory with doc deployment (only for firely)
factoryWithDocs.addSteps(gnunet_meson_build_steps)
-# Add the deployment step
-factoryWithDocs.addStep(steps.ShellCommand(command=['meson', 'compile',
- '-C', 'build',
- 'doxygen'],
- haltOnFailure=True,
- name="Doxygen"))
-
-factoryWithDocs.addStep(steps.ShellSequence(
- name=util.Interpolate("Deploy Doxygen"),
- workdir=util.Interpolate('build/doc'),
- commands=[
- util.ShellArg(command=['chmod', '-R', 'ag+rX', '../doc'],
- logname='Permissions',
- haltOnFailure=True),
- util.ShellArg(command=['rsync', '-a', '--delete',
- '--exclude', 'sphinx',
- '../doc/doxygen',
- 'handbook@firefly.gnunet.org:~/doc_deployment/'],
- logname='Deploy',
- haltOnFailure=True),
- ]))
-
############################
# COVERITY #
@@ -748,9 +726,15 @@ dist_factory.addStep(steps.ShellSequence(
haltOnFailure=True),
util.ShellArg(command=['meson', 'dist',
'-C', 'build',
- '--no-tests'],
+ '--no-tests',
+ '--formats', 'gztar', 'xztar'],
logname="dist",
haltOnFailure=True)
+ util.ShellArg(command=['meson', 'compile',
+ '-C', 'build',
+ 'doxygen'],
+ haltOnFailure=True,
+ name="Doxygen"))
]))
# Get version number of tarball
@@ -766,6 +750,8 @@ dist_factory.addStep(steps.ShellCommand(command=["tar",
'-C', 'build'],
haltOnFailure=True,
name="Extracting tarball"))
+
+# Make doxygen
# Try to build dist package
dist_factory.addStep(steps.ShellSequence(
workdir=util.Interpolate('build/build/gnunet-%(prop:gnunet_meson_releasever)s'),
@@ -792,77 +778,34 @@ dist_factory.addStep(steps.ShellSequence(
haltOnFailure=True)]
))
+# Upload artifact to https://buildbot.gnunet.org/artifacts
+dist_factory.addStep(steps.FileUpload(workersrc=util.Interpolate('build/meson-dist/gnunet-%(prop:gnunet_meson_releasever)s.tar.xz'),
+ mode=0o644,
+ masterdest=util.Interpolate("~/artifacts/gnunet-%(prop:gnunet_releasever)s.tar.xz"),
+ url=util.Interpolate("https://buildbot.gnunet.org/artifacts/gnunet-%(prop:gnunet_meson_releasever)s.tar.xz")))
+dist_factory.addStep(steps.FileUpload(workersrc=util.Interpolate('build/meson-dist/gnunet-%(prop:gnunet_meson_releasever)s.tar.gz'),
+ mode=0o644,
+ masterdest=util.Interpolate("~/artifacts/gnunet-%(prop:gnunet_releasever)s.tar.gz"),
+ url=util.Interpolate("https://buildbot.gnunet.org/artifacts/gnunet-%(prop:gnunet_meson_releasever)s.tar.gz")))
-dist_factory.addStep(steps.ShellSequence(
- name=util.Interpolate("Git rev. %(prop:got_revision)s build"),
- haltOnFailure=True,
- commands=[
- util.ShellArg(command=['./bootstrap', 'autotools'],
- logname='bootstrap',
- haltOnFailure=True),
- util.ShellArg(command=['./configure',
- "--prefix=/tmp/gnunet-buildbot",
- "--enable-experimental"],
- logname="configure",
- haltOnFailure=True),
- util.ShellArg(command=['make', 'dist'],
- logname='make dist',
- haltOnFailure=True)
- ]))
-# Get version number of tarball
-cmd = 'ls -1 gnunet-*.tar.gz | sed "s/gnunet-//" | sed "s/.tar.gz//" | tail -n1'
-#cmd = 'git describe --tags | sed "s/^v//"'
-dist_factory.addStep(steps.SetPropertyFromCommand(hideStepIf=False,
- command=cmd,
- property='gnunet_releasever',
- name="Getting release version"))
-dist_factory.addStep(steps.ShellCommand(command=["tar",
- "xvzpf",
- util.Interpolate('gnunet-%(prop:gnunet_releasever)s.tar.gz')],
- haltOnFailure=True,
- name="Extracting tarball"))
-# Try to build dist package
+# Update doxygen (TODO skit on nightly?)
dist_factory.addStep(steps.ShellSequence(
- workdir=util.Interpolate('build/gnunet-%(prop:gnunet_releasever)s'),
- name=util.Interpolate("GNUnet %(prop:gnunet_releasever)s tarball build"),
- env={'GNUNET_PREFIX': '/tmp/gnunet-buildbot/lib',
- 'PATH': ["/tmp/gnunet-buildbot/bin", "${PATH}"]},
+ name=util.Interpolate("Deploy Doxygen"),
+ workdir=util.Interpolate('build/doc'),
commands=[
- util.ShellArg(command=['mkdir', '-p', '$TMPDIR'],logname='tmpdir',haltOnFailure=True),
- util.ShellArg(command=['./configure',
- "--prefix=/tmp/gnunet-buildbot",
- "--enable-experimental"],
- logname='configure',
- haltOnFailure=True),
- util.ShellArg(command=['make', '-j16'],
- logname='make',
- haltOnFailure=True),
- util.ShellArg(command=['make', 'install'],
- logname='make install',
+ util.ShellArg(command=['chmod', '-R', 'ag+rX', '../doc'],
+ logname='Permissions',
haltOnFailure=True),
- #util.ShellArg(command=['make', 'check'],
- # logname='make check',
- # warnOnFailure=True, flunkOnFailure=False), # make check has issues.
- util.ShellArg(command=['make', 'uninstall'],
- logname='make uninstall',
+ util.ShellArg(command=['rsync', '-a', '--delete',
+ '../doc/doxygen',
+ 'handbook@firefly.gnunet.org:~/doc_deployment/'],
+ logname='Deploy',
haltOnFailure=True),
]))
-# Upload artifact to https://buildbot.gnunet.org/artifacts
-dist_factory.addStep(steps.FileUpload(workersrc=util.Interpolate('gnunet-%(prop:gnunet_releasever)s.tar.gz'),
- mode=0o644,
- masterdest=util.Interpolate("~/artifacts/gnunet-%(prop:gnunet_releasever)s-autotools.tar.gz"),
- url=util.Interpolate("https://buildbot.gnunet.org/artifacts/gnunet-%(prop:gnunet_releasever)s-autotools.tar.gz")))
-dist_factory.addStep(steps.FileUpload(workersrc=util.Interpolate('build/meson-dist/gnunet-%(prop:gnunet_meson_releasever)s.tar.xz'),
- mode=0o644,
- masterdest=util.Interpolate("~/artifacts/gnunet-%(prop:gnunet_releasever)s.tar.xz"),
- url=util.Interpolate("https://buildbot.gnunet.org/artifacts/gnunet-%(prop:gnunet_meson_releasever)s.tar.xz")))
-
-
-
###########################
# Fedora COPR build #
@@ -954,7 +897,7 @@ BUILDERS.append(
BUILDERS.append(
util.BuilderConfig(name="gnunet-debian-x86_64",
workernames=["firefly-x86_64-amdepyc"],
- factory=factoryWithDocs))
+ factory=factoryMeson))
BUILDERS.append(
util.BuilderConfig(name="gnunet-fedora-aarch64",
