From 2a2a2793e42aaecd1f6337adcb6e6664147a534c Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 20 Jul 2024 00:46:40 +0200 Subject: [PATCH] fix(workdir): rebase in build/ for `ShellMixin` Signed-off-by: Raito Bezarius --- buildbot_nix/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildbot_nix/__init__.py b/buildbot_nix/__init__.py index e43e5fb..a621eac 100644 --- a/buildbot_nix/__init__.py +++ b/buildbot_nix/__init__.py @@ -507,7 +507,7 @@ class NixConfigure(buildstep.CommandMixin, steps.BuildStep): # Takes precedence. configure_log.addStdout("checking if there's a .ci/buildbot.nix...") - ci_buildbot_defn_exists = yield self.pathExists('.ci/buildbot.nix') + ci_buildbot_defn_exists = yield self.pathExists('build/.ci/buildbot.nix') if ci_buildbot_defn_exists: configure_log.addStdout(".ci/buildbot.nix found, configured for non-flake CI") self.build.addStepAfterCurrentStep( @@ -518,7 +518,7 @@ class NixConfigure(buildstep.CommandMixin, steps.BuildStep): ) ) - flake_exists = yield self.pathExists('flake.nix') + flake_exists = yield self.pathExists('build/flake.nix') if flake_exists: configure_log.addStdout(f"flake.nix found") self.build.addStepAfterCurrentStep(