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

fix(workdir): rebase in build/ for ShellMixin

Browse source 
Signed-off-by: Raito Bezarius <raito@lix.systems>
This commit is contained in:
raito 2024-07-20 00:46:40 +02:00
parent 97dee6cfec
commit 2a2a2793e4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
buildbot_nix/__init__.py
View file

@ -507,7 +507,7 @@ class NixConfigure(buildstep.CommandMixin, steps.BuildStep):
# Takes precedence. # Takes precedence.
configure_log.addStdout("checking if there's a .ci/buildbot.nix...") 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: if ci_buildbot_defn_exists:
configure_log.addStdout(".ci/buildbot.nix found, configured for non-flake CI") configure_log.addStdout(".ci/buildbot.nix found, configured for non-flake CI")
self.build.addStepAfterCurrentStep( 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: if flake_exists:
configure_log.addStdout(f"flake.nix found") configure_log.addStdout(f"flake.nix found")
self.build.addStepAfterCurrentStep( self.build.addStepAfterCurrentStep(