Merge pull request #63 from flichtenheld/gdbuspp-live-install

Switch to build gdbuspp during build

buildbot-host/buildbot-worker-alpine-3/Dockerfile.base

@@ -2,4 +2,3 @@ ARG IMAGE=alpine:3.18.4
 ARG DEPS_SH=install-openvpn-build-deps-alpine.sh
 ARG MY_NAME="buildbot-worker-alpine-3"
 ARG MY_VERSION="v1.1.0"
-ARG INSTALL_GDBUSPP="yes"

buildbot-host/buildbot-worker-arch/Dockerfile.base

@@ -3,4 +3,3 @@ ARG DEPS_SH=install-openvpn-build-deps-arch.sh
 ARG MY_NAME="buildbot-worker-arch"
 ARG PIP_INSTALL_OPTS="--break-system-packages"
 ARG MY_VERSION="v1.1.0"
-ARG INSTALL_GDBUSPP="yes"

buildbot-host/buildbot-worker-debian-11/Dockerfile.base

@@ -2,4 +2,3 @@ ARG IMAGE=debian:11
 ARG DEPS_SH=install-openvpn-build-deps-ubuntu.sh
 ARG MY_NAME="buildbot-worker-debian-11"
 ARG MY_VERSION="v1.0.3"
-ARG INSTALL_GDBUSPP="no"

buildbot-host/buildbot-worker-debian-12/Dockerfile.base

@@ -3,4 +3,3 @@ ARG DEPS_SH=install-openvpn-build-deps-ubuntu.sh
 ARG MY_NAME="buildbot-worker-debian-12"
 ARG PIP_INSTALL_OPTS="--break-system-packages"
 ARG MY_VERSION="v1.1.0"
-ARG INSTALL_GDBUSPP="yes"

buildbot-host/buildbot-worker-debian-unstable/Dockerfile.base

@@ -3,4 +3,3 @@ ARG DEPS_SH=install-openvpn-build-deps-ubuntu.sh
 ARG MY_NAME="buildbot-worker-debian-unstable"
 ARG PIP_INSTALL_OPTS="--break-system-packages"
 ARG MY_VERSION="v1.1.0"
-ARG INSTALL_GDBUSPP="yes"

buildbot-host/buildbot-worker-fedora-39/Dockerfile.base

@@ -2,4 +2,3 @@ ARG IMAGE=fedora:39
 ARG DEPS_SH=install-openvpn-build-deps-fedora.sh
 ARG MY_NAME="buildbot-worker-fedora-39"
 ARG MY_VERSION="v1.1.0"
-ARG INSTALL_GDBUSPP="yes"

buildbot-host/buildbot-worker-fedora-40/Dockerfile.base

@@ -2,4 +2,3 @@ ARG IMAGE=fedora:40
 ARG DEPS_SH=install-openvpn-build-deps-fedora.sh
 ARG MY_NAME="buildbot-worker-fedora-40"
 ARG MY_VERSION="v1.1.0"
-ARG INSTALL_GDBUSPP="yes"

buildbot-host/buildbot-worker-fedora-rawhide/Dockerfile.base

@@ -2,4 +2,3 @@ ARG IMAGE=fedora:rawhide
 ARG DEPS_SH=install-openvpn-build-deps-fedora.sh
 ARG MY_NAME="buildbot-worker-fedora-rawhide"
 ARG MY_VERSION="v1.1.0"
-ARG INSTALL_GDBUSPP="yes"

buildbot-host/buildbot-worker-opensuse-leap-15/Dockerfile.base

@@ -2,4 +2,3 @@ ARG IMAGE=opensuse/leap:15
 ARG DEPS_SH=install-openvpn-build-deps-opensuse-leap.sh
 ARG MY_NAME="buildbot-worker-opensuse-leap-15"
 ARG MY_VERSION="v1.0.3"
-ARG INSTALL_GDBUSPP="no"

buildbot-host/buildbot-worker-ubuntu-2004/Dockerfile.base

@@ -2,4 +2,3 @@ ARG IMAGE=ubuntu:20.04
 ARG DEPS_SH=install-openvpn-build-deps-ubuntu.sh
 ARG MY_NAME="buildbot-worker-ubuntu-2004"
 ARG MY_VERSION="v1.0.3"
-ARG INSTALL_GDBUSPP="no"

buildbot-host/buildbot-worker-ubuntu-2204/Dockerfile.base

@@ -2,4 +2,3 @@ ARG IMAGE=ubuntu:22.04
 ARG DEPS_SH=install-openvpn-build-deps-ubuntu.sh
 ARG MY_NAME="buildbot-worker-ubuntu-2204"
 ARG MY_VERSION="v1.1.0"
-ARG INSTALL_GDBUSPP="yes"

buildbot-host/buildbot-worker-ubuntu-2404/Dockerfile.base

@@ -3,4 +3,3 @@ ARG DEPS_SH=install-openvpn-build-deps-ubuntu.sh
 ARG MY_NAME="buildbot-worker-ubuntu-2404"
 ARG PIP_INSTALL_OPTS="--break-system-packages"
 ARG MY_VERSION="v1.1.0"
-ARG INSTALL_GDBUSPP="yes"

buildbot-host/buildmaster/master.cfg

@@ -464,7 +464,7 @@ for steps_file in ["common_linux_steps.cfg"]:
     )
 
 # OpenVPN 3 linux build steps
-for steps_file in ["common_linux_steps.cfg"]:
+for steps_file in ["common_linux_steps.cfg", "gdbuspp_steps.cfg"]:
     exec(
         compile(
             source=open(os.path.join("openvpn3-linux", steps_file)).read(),
@@ -651,6 +651,7 @@ del factory
 
 # OpenSSL openvpn3-linux smoketest builds
 factory = util.BuildFactory()
+factory = openvpn3LinuxAddGdbusppStepsToBuildFactory(factory)
 factory = openvpn3LinuxAddCommonLinuxStepsToBuildFactory(factory)
 factory_name = "openvpn3-linux-openssl-smoketest"
 factories.update(
@@ -667,6 +668,7 @@ del factory
 
 # OpenSSL openvpn3-linux builds
 factory = util.BuildFactory()
+factory = openvpn3LinuxAddGdbusppStepsToBuildFactory(factory)
 factory = openvpn3LinuxAddCommonLinuxStepsToBuildFactory(factory)
 factory_name = "openvpn3-linux-openssl"
 factories.update(

buildbot-host/buildmaster/openvpn/common_unix_steps.cfg

@@ -48,6 +48,7 @@ def openvpnAddCommonUnixStepsToBuildFactory(factory, combo, shell_env=None):
             description="configuring",
             descriptionDone="configuring",
             env=shell_env,
+            haltOnFailure=True,
         )
     )
 

buildbot-host/buildmaster/openvpn3-linux/common_linux_steps.cfg

@@ -8,6 +8,7 @@ def openvpn3LinuxAddCommonLinuxStepsToBuildFactory(factory):
             name="clone",
             description="cloning",
             descriptionDone="cloning",
+            submodules=True,
         )
     )
 
@@ -31,7 +32,7 @@ def openvpn3LinuxAddCommonLinuxStepsToBuildFactory(factory):
 
     factory.addStep(
         steps.ShellCommand(
-            command=["meson", "compile", "-C", "_builddir"],
+            command=["meson", "compile", "-C", "_builddir", "--jobs=1"],
             name="building",
             description="building",
             descriptionDone="building",

buildbot-host/buildmaster/openvpn3-linux/gdbuspp_steps.cfg

@@ -0,0 +1,52 @@
+# -*- python -*-
+# ex: set filetype=python:
+def openvpn3LinuxAddGdbusppStepsToBuildFactory(factory):
+    factory.addStep(
+        steps.Git(
+            repourl="https://codeberg.org/OpenVPN/gdbuspp.git",
+            mode="incremental",
+            name="clone",
+            description="cloning",
+            descriptionDone="cloning",
+            descriptionSuffix="gdbuspp",
+            alwaysUseLatest=True,
+            workdir="gdbuspp",
+        )
+    )
+
+    factory.addStep(
+        steps.ShellCommand(
+            command=["meson", "setup", "--prefix=/usr", "_builddir"],
+            name="configure",
+            description="configuring",
+            descriptionDone="configuring",
+            descriptionSuffix="gdbuspp",
+            workdir="gdbuspp",
+            haltOnFailure=True,
+        )
+    )
+
+    factory.addStep(
+        steps.ShellCommand(
+            command=["meson", "compile", "-C", "_builddir", "--jobs=1"],
+            name="building",
+            description="building",
+            descriptionDone="building",
+            descriptionSuffix="gdbuspp",
+            workdir="gdbuspp",
+            haltOnFailure=True,
+        )
+    )
+
+    factory.addStep(
+        steps.ShellCommand(
+            command=["meson", "install", "-C", "_builddir"],
+            name="installing",
+            description="installing",
+            descriptionDone="installing",
+            descriptionSuffix="gdbuspp",
+            workdir="gdbuspp",
+        )
+    )
+
+    return factory

buildbot-host/buildmaster/openvpn3/common_linux_steps.cfg

@@ -35,6 +35,7 @@ def openvpn3AddCommonLinuxStepsToBuildFactory(factory):
             workdir="build/build",
             description="configuring",
             descriptionDone="configuring",
+            haltOnFailure=True,
         )
     )
 

buildbot-host/snippets/Dockerfile.common

@@ -11,14 +11,6 @@ RUN set -ex; \
     /buildbot/${DEPS_SH}; \
     rm -f ${DEPS_SH}
 
-# Install gdbuspp, which is a dependency of openvpn3-linux
-ARG INSTALL_GDBUSPP
-COPY scripts/install-gdbuspp.sh /buildbot/
-RUN set -x; \
-    /buildbot/install-gdbuspp.sh; \
-    rm -f install-gdbuspp.sh; \
-    rm -rf /buildbot/gdbuspp
-
 # Install buildbot
 ARG MY_NAME
 ARG PIP_INSTALL_OPTS