fix(workdir): rebase in build/ for ShellMixin

Signed-off-by: Raito Bezarius <raito@lix.systems>
This commit is contained in:
raito 2024-07-20 00:46:40 +02:00
parent e206bb1a80
commit f4e23bb4d6

View file

@ -468,7 +468,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(
@ -479,7 +479,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(