lix-project/buildbot-nix
15
0
Fork 0
Code Issues 13 Pull requests 7 Packages Projects Releases Wiki Activity

feat: prepare for non-flakes entrypoint #22

Open
raito wants to merge 9 commits from prepare-for-non-flakes into main
pull from: prepare-for-non-flakes
merge into: lix-project:main
Conversation 0 Commits 9 Files changed 2 +3 -3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 78ddc0b3e5 - Show all commits

6
buildbot_nix/__init__.py
View file

@ -177,7 +177,7 @@ class BuildTrigger(steps.BuildStep):
return sch return sch
def schedule_one(self, build_props: Properties, job): 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" source = f"{project_name}-eval"
attr = job.get("attr", "eval-error") attr = job.get("attr", "eval-error")
name = f"buildbotJobs.{attr}" name = f"buildbotJobs.{attr}"
jade commented 2024-10-05 19:25:10 +00:00
Review
Copy link

uhhhhhhhhhhhhhhhhhhhhhhhhhh this is a regression, no?

uhhhhhhhhhhhhhhhhhhhhhhhhhh this is a regression, no?
raito commented 2024-10-05 21:03:26 +00:00
Review
Copy link

yes, this won't work on our lix stuff, I can fix it back for backward compat

yes, this won't work on our lix stuff, I can fix it back for backward compat
@ -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 # run nix-eval-jobs --flake .#$FLAKE_TARGET_ATTRIBUTE_FOR_JOBS to generate the dict of stages
cmd: remotecommand.RemoteCommand = yield self.makeRemoteShellCommand() cmd: remotecommand.RemoteCommand = yield self.makeRemoteShellCommand()
build_props = self.build.getProperties() build_props = self.build.getProperties()
project_name = build_props.getProperty('event.refUpdate.project') project_name = build_props.getProperty("event.refUpdate.project") or build_props.getProperty("event.change.project")
assert project_name is not None, "`event.refUpdate.project` is not available on the build properties, unexpected build type!" 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) yield self.runCommand(cmd)