Skip to content
Snippets Groups Projects
Commit 544e4311 authored by GitBot's avatar GitBot
Browse files

Integrate gitlab-ci/fix-reuse-of-outdated-integration-branch

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@bcb6076b

CI: Add check if integration branch is on top of target branch before reusing it

The integration branch was reused even if there where new commits on the
target branch, which could lead into reverting some changes.
This adds a check, if the existing integration branch is directly based
on the target branch and deletes it if not.
parent 4b38f38e
No related branches found
No related tags found
1 merge request!46Integrate gitlab-ci/fix-reuse-of-outdated-integration-branch
Subproject commit 3b5e9be0f5548af8ad42ab9b2701b7804c4cada6
Subproject commit bcb6076bc67279ac451d5d0d3449bbc89c4830d6
......@@ -4,7 +4,7 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
ref: 3b5e9be0f5548af8ad42ab9b2701b7804c4cada6
ref: bcb6076bc67279ac451d5d0d3449bbc89c4830d6
file: 'manifest-integration.yml'
variables:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment