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

feat: non-flakes entrypoint #23

Open
raito wants to merge 17 commits from non-flakes-rerun into main
pull from: non-flakes-rerun
merge into: lix-project:main
Conversation 2 Commits 17 Files changed 2 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 996b932b21 - Show all commits

4
buildbot_nix/__init__.py
View file

@ -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(