From 77d90b5c3c346da7011447cf51d2c22ddd7114bd Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Fri, 6 May 2022 13:46:32 +0000
Subject: [PATCH] Integrate gitlab-ci/fix-reuse-of-outdated-integration-branch
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/bcb6076bc67279ac451d5d0d3449bbc89c4830d6
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.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 3b5e9be..bcb6076 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 3b5e9be0f5548af8ad42ab9b2701b7804c4cada6
+Subproject commit bcb6076bc67279ac451d5d0d3449bbc89c4830d6
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dacfb73..4309f52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 3b5e9be0f5548af8ad42ab9b2701b7804c4cada6
+ ref: bcb6076bc67279ac451d5d0d3449bbc89c4830d6
file: 'manifest-integration.yml'
variables:
--
GitLab