Merge pull request #419 from nix-community/skipped-builds

Skip builds fully to avoid delays from worker setup

Author: Mic92

buildbot_nix/buildbot_nix/__init__.py

@@ -21,6 +21,7 @@
 from buildbot.locks import MasterLock
 from buildbot.plugins import schedulers, steps, util, worker
 from buildbot.process import buildstep, logobserver, remotecommand
+from buildbot.process.build import Build
 from buildbot.process.project import Project
 from buildbot.process.properties import Properties
 from buildbot.process.results import ALL_RESULTS, SUCCESS, statusToString, worst_status
@@ -1145,7 +1146,7 @@ def nix_eval_config(
 
 
 async def do_register_gcroot_if(
-    s: steps.BuildStep, branch_config: models.BranchConfigDict
+    s: steps.BuildStep | Build, branch_config: models.BranchConfigDict
 ) -> bool:
     gc_root = await util.Interpolate(
         "/nix/var/nix/gcroots/per-user/buildbot-worker/%(prop:project)s/%(prop:attr)s"
@@ -1384,8 +1385,8 @@ def nix_skipped_build_config(
         collapseRequests=False,
         env={},
         factory=factory,
-        # FIXME: we can enable this after the next buildbot update.
-        # do_build_if=lambda build: do_register_gcroot_if(build, branch_config_dict) and outputs_path is not None,
+        do_build_if=lambda build: do_register_gcroot_if(build, branch_config_dict)
+        and outputs_path is not None,
     )
 
 

nix/packages.nix

@@ -18,7 +18,15 @@ in
 
     buildbot = lib.mkOption {
       type = lib.types.package;
-      default = pkgs.buildbot;
+      default = pkgs.buildbot.overrideAttrs (o: {
+        patches = o.patches ++ [
+          (pkgs.fetchpatch {
+            name = "add-Build.skipBuildIf.patch";
+            url = "https://github.com/buildbot/buildbot/commit/f08eeef96e15c686a4f6ad52368ad08246314751.patch";
+            hash = "sha256-ACPYXMbjIfw02gsKwmDKIIZkGSxxLWCaW7ceEcgbtIU=";
+          })
+        ];
+      });
     };
 
     buildbot-worker = lib.mkOption {