fix(ret): return success and write \n
Signed-off-by: Raito Bezarius <raito@lix.systems>
This commit is contained in:
parent
c824b084e8
commit
1484a875dc
|
@ -506,10 +506,10 @@ class NixConfigure(buildstep.CommandMixin, steps.BuildStep):
|
||||||
configure_log: Log = yield self.addLog("stdio")
|
configure_log: Log = yield self.addLog("stdio")
|
||||||
|
|
||||||
# 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...\n")
|
||||||
ci_buildbot_defn_exists = yield self.pathExists('build/.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\n")
|
||||||
self.build.addStepsAfterCurrentStep(
|
self.build.addStepsAfterCurrentStep(
|
||||||
[
|
[
|
||||||
make_job_evaluator(
|
make_job_evaluator(
|
||||||
|
@ -519,6 +519,7 @@ class NixConfigure(buildstep.CommandMixin, steps.BuildStep):
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
return SUCCESS
|
||||||
|
|
||||||
flake_exists = yield self.pathExists('build/flake.nix')
|
flake_exists = yield self.pathExists('build/flake.nix')
|
||||||
if flake_exists:
|
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!")
|
configure_log.addStdout("neither flake.nix found neither .ci/buildbot.nix, no CI to run!")
|
||||||
|
return SUCCESS
|
||||||
|
|
||||||
class NixBuildCommand(buildstep.ShellMixin, steps.BuildStep):
|
class NixBuildCommand(buildstep.ShellMixin, steps.BuildStep):
|
||||||
"""Builds a nix derivation."""
|
"""Builds a nix derivation."""
|
||||||
|
|
Loading…
Reference in a new issue