Skip to content
Snippets Groups Projects
Commit 5c3ac7a2 authored by Jonas Höppner's avatar Jonas Höppner
Browse files

CI: merge_into_manifest: Fix detection of gitlab-ci integration branch

parent 3dbeefbd
No related branches found
No related tags found
1 merge request!118CI: merge_into_manifest: Fix detection of gitlab-ci integration branch
Pipeline #9127 passed with stage
Stage:
    in 33 seconds
    Hide whitespace changes
    Inline Side-by-side
    common.py
    + 1
    − 1
    View file @ 5c3ac7a2
    ...@@ -23,7 +23,7 @@ def integration_branch_name(project_name, branch_name): ...@@ -23,7 +23,7 @@ def integration_branch_name(project_name, branch_name):
    def is_gitlab_ci_integration_branch(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) return branch_name.startswith(gitlab_ci_integration_branch)
    ......
    merge_into_manifest.py
    + 3
    − 1
    View file @ 5c3ac7a2
    ...@@ -46,7 +46,9 @@ def merge_into_manifest( ...@@ -46,7 +46,9 @@ def merge_into_manifest(
    if common.is_gitlab_ci_integration_branch(original_branch): if common.is_gitlab_ci_integration_branch(original_branch):
    print( 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 "" return ""
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment