From 177c6b3efb46a06c29807a0ed285ad5d25c2b6c5 Mon Sep 17 00:00:00 2001
From: guf-gitbot <gitbot@garz-fricke.com>
Date: Fri, 25 Mar 2022 13:30:24 +0000
Subject: [PATCH] Integrate gitlab-ci/CI-fix-merges-after-gitlab-ci and 2 more
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/7381d5983371f0bedd89d6c40db6c600932909e6
CI: merge_into_manifest: Fix already merged detection
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/5bb84a04cd6de815350f7dbcf59dd04c2b94a6f7
CI: Merge_into_manifest: Fixes for merge detection
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/285ce1951cc2ce2f6a0c390a6ece5042d930e95a
CI: Merge_into_manifest: Fixes for merge detection
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index ce59c409..7381d598 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit ce59c40987d7a247d6e0eae713fc806237ace207
+Subproject commit 7381d5983371f0bedd89d6c40db6c600932909e6
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1c04d14..32d9d162 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,5 +4,5 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: ce59c40987d7a247d6e0eae713fc806237ace207
+ ref: 7381d5983371f0bedd89d6c40db6c600932909e6
file: 'manifest-integration.yml'
--
GitLab