diff --git a/common.py b/common.py index f7e2b764a194ca1df22ae29ed4cf3ddc494fb299..6da0c1a3074c1002b6640e205339ddd14647ce85 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 93e7714debd989045752b78aadfb862ab40c54d3..603a9ccd6deb2bc1759bf6cf8a2e978b2b84224e 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 ""