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 +5 -3
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 64372b3dcc - Show all commits

8
buildbot_nix/__init__.py
View file

@ -506,10 +506,10 @@ class NixConfigure(buildstep.CommandMixin, steps.BuildStep):
configure_log: Log = yield self.addLog("stdio")
# Takes precedence.
configure_log.addStdout("checking if there's a .ci/buildbot.nix...")
configure_log.addStdout("checking if there's a .ci/buildbot.nix...\n")
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")
configure_log.addStdout(".ci/buildbot.nix found, configured for non-flake CI\n")
self.build.addStepsAfterCurrentStep(
[
make_job_evaluator(
@ -519,6 +519,7 @@ class NixConfigure(buildstep.CommandMixin, steps.BuildStep):
)
]
)
return SUCCESS
flake_exists = yield self.pathExists('build/flake.nix')
if flake_exists:
@ -531,9 +532,10 @@ class NixConfigure(buildstep.CommandMixin, steps.BuildStep):
)
]
)
return
return SUCCESS
configure_log.addStdout("neither flake.nix found neither .ci/buildbot.nix, no CI to run!")
return SUCCESS
class NixBuildCommand(buildstep.ShellMixin, steps.BuildStep):
"""Builds a nix derivation."""