|
21 | 21 | from buildbot.locks import MasterLock
|
22 | 22 | from buildbot.plugins import schedulers, steps, util, worker
|
23 | 23 | from buildbot.process import buildstep, logobserver, remotecommand
|
| 24 | +from buildbot.process.build import Build |
24 | 25 | from buildbot.process.project import Project
|
25 | 26 | from buildbot.process.properties import Properties
|
26 | 27 | from buildbot.process.results import ALL_RESULTS, SUCCESS, statusToString, worst_status
|
@@ -1145,7 +1146,7 @@ def nix_eval_config(
|
1145 | 1146 |
|
1146 | 1147 |
|
1147 | 1148 | async def do_register_gcroot_if(
|
1148 |
| - s: steps.BuildStep, branch_config: models.BranchConfigDict |
| 1149 | + s: steps.BuildStep | Build, branch_config: models.BranchConfigDict |
1149 | 1150 | ) -> bool:
|
1150 | 1151 | gc_root = await util.Interpolate(
|
1151 | 1152 | "/nix/var/nix/gcroots/per-user/buildbot-worker/%(prop:project)s/%(prop:attr)s"
|
@@ -1384,8 +1385,8 @@ def nix_skipped_build_config(
|
1384 | 1385 | collapseRequests=False,
|
1385 | 1386 | env={},
|
1386 | 1387 | factory=factory,
|
1387 |
| - # FIXME: we can enable this after the next buildbot update. |
1388 |
| - # do_build_if=lambda build: do_register_gcroot_if(build, branch_config_dict) and outputs_path is not None, |
| 1388 | + do_build_if=lambda build: do_register_gcroot_if(build, branch_config_dict) |
| 1389 | + and outputs_path is not None, |
1389 | 1390 | )
|
1390 | 1391 |
|
1391 | 1392 |
|
|
0 commit comments