From 1830cb0291a866af5cebeebbfdbac32544f655c7 Mon Sep 17 00:00:00 2001 From: Tim Jaacks <tim.jaacks@seco.com> Date: Fri, 17 Nov 2023 13:54:02 +0100 Subject: [PATCH] And another improvement for the build-up-to-date job --- scripts/check_if_integration_branch_is_up_to_date.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/check_if_integration_branch_is_up_to_date.py b/scripts/check_if_integration_branch_is_up_to_date.py index 82b52d09..da0689f1 100755 --- a/scripts/check_if_integration_branch_is_up_to_date.py +++ b/scripts/check_if_integration_branch_is_up_to_date.py @@ -113,7 +113,7 @@ def main(): print( f"Integration branch {integration_branch_name} in {target_project.name} " f"is up to date.\n" - f"This means that the build on this merge request has run on the latest" + f"This means that the build on this merge request has run on the latest\n" f"manifest state.\n" f"Please be aware that if the merge request is not immediately merged,\n" f"the manifest might advance in the meantime. The build on this merge\n" @@ -123,7 +123,7 @@ def main(): f"You can then either re-run the pipeline to have a new build on the new\n" f"manifest state, or merge the merge request anyway at the risk of\n" f"breaking the manifest build in case the changes of this merge request\n" - f"are incompatible with the upstream changes.\n" + f"are incompatible with the upstream changes.\n\n" ) else: sys.exit( @@ -144,7 +144,7 @@ def main(): f" If you decide on this option, please:\n" f" 1. Open the MR pipelines page:\n" f" {merge_request.web_url}/pipelines\n " - f" 2. Click 'Run Pipeline'\n" + f" 2. Click 'Run Pipeline'\n\n" ) -- GitLab