From dd95055cb6a693a5eabdc93903407e8585aade5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 12 Oct 2023 12:43:57 +0200 Subject: [PATCH] make per-project gcroots --- buildbot_nix/buildbot_nix.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/buildbot_nix/buildbot_nix.py b/buildbot_nix/buildbot_nix.py index aa1b47f..d68a94d 100644 --- a/buildbot_nix/buildbot_nix.py +++ b/buildbot_nix/buildbot_nix.py @@ -337,7 +337,7 @@ def nix_update_flake_config( "--base", project.default_branch, ], - doStepIf=util.Interpolate("has_pr") != "OPEN", + doStepIf=lambda s: s.getProperty("has_pr") != "OPEN", ) ) return util.BuilderConfig( @@ -468,12 +468,13 @@ def nix_build_config( "--add-root", # FIXME: cleanup old build attributes util.Interpolate( - "/nix/var/nix/profiles/per-user/buildbot-worker/result-%(prop:attr)s" + "/nix/var/nix/gcroots/per-user/buildbot-worker/%(prop:project)s/%(prop:attr)s" ), "-r", util.Property("out_path"), ], - doStepIf=lambda s: s.getProperty("branch") == s.getProperty("github.repository.default_branch"), + doStepIf=lambda s: s.getProperty("branch") + == s.getProperty("github.repository.default_branch"), ) ) factory.addStep(