From 64372b3dcc690cc6d9f99850ca4f7a1e1f3025df Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 20 Jul 2024 01:01:24 +0200 Subject: [PATCH] fix(ret): return success and write \n Signed-off-by: Raito Bezarius --- buildbot_nix/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/buildbot_nix/__init__.py b/buildbot_nix/__init__.py index 08f9c0c..65ba547 100644 --- a/buildbot_nix/__init__.py +++ b/buildbot_nix/__init__.py @@ -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."""