From 5c3ac7a26ba751f31a2832f06778f5135b07f021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6ppner?= <jonas.hoeppner@garz-fricke.com>
Date: Wed, 30 Mar 2022 09:31:31 +0200
Subject: [PATCH] CI: merge_into_manifest: Fix detection of gitlab-ci
integration branch
---
common.py | 2 +-
merge_into_manifest.py | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/common.py b/common.py
index f7e2b764..6da0c1a3 100755
--- a/common.py
+++ b/common.py
@@ -23,7 +23,7 @@ def integration_branch_name(project_name, branch_name):
def is_gitlab_ci_integration_branch(branch_name):
- gitlab_ci_integration_branch = "integrate/gitlab_ci"
+ gitlab_ci_integration_branch = "integrate/gitlab-ci"
return branch_name.startswith(gitlab_ci_integration_branch)
diff --git a/merge_into_manifest.py b/merge_into_manifest.py
index 93e7714d..603a9ccd 100755
--- a/merge_into_manifest.py
+++ b/merge_into_manifest.py
@@ -46,7 +46,9 @@ def merge_into_manifest(
if common.is_gitlab_ci_integration_branch(original_branch):
print(
- "Commit {} is a gitlab-ci integration branch and will be merged by the gitlab-ci pipeline."
+ "Commit {} is on a gitlab-ci integration branch and will be merged by the gitlab-ci pipeline.".format(
+ commit
+ )
)
return ""
--
GitLab