From 1711bfd84047fd78855929b66b0ea96fa59cf293 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 22 Jul 2024 22:42:35 +0200 Subject: [PATCH] fix(eval): `event.change.project` is also a buildprop for project name Signed-off-by: Raito Bezarius --- buildbot_nix/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildbot_nix/__init__.py b/buildbot_nix/__init__.py index 3fd89cf..49f97f6 100644 --- a/buildbot_nix/__init__.py +++ b/buildbot_nix/__init__.py @@ -177,7 +177,7 @@ class BuildTrigger(steps.BuildStep): return sch def schedule_one(self, build_props: Properties, job): - project_name = build_props.getProperty('event.project') + project_name = build_props.getProperty("event.refUpdate.project") or build_props.getProperty("event.change.project") source = f"{project_name}-eval" attr = job.get("attr", "eval-error") name = f"buildbotJobs.{attr}" @@ -371,8 +371,8 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep): # run nix-eval-jobs --flake .#$FLAKE_TARGET_ATTRIBUTE_FOR_JOBS to generate the dict of stages cmd: remotecommand.RemoteCommand = yield self.makeRemoteShellCommand() build_props = self.build.getProperties() - project_name = build_props.getProperty('event.refUpdate.project') - assert project_name is not None, "`event.refUpdate.project` is not available on the build properties, unexpected build type!" + project_name = build_props.getProperty("event.refUpdate.project") or build_props.getProperty("event.change.project") + assert project_name is not None, "`event.refUpdate.project` or `event.change.project` is not available on the build properties, unexpected build type!" yield self.runCommand(cmd)