From b04c251716ef07c46e47eba79eebb76e47cbb984 Mon Sep 17 00:00:00 2001
From: guf-gitbot <gitbot@garz-fricke.com>
Date: Tue, 29 Mar 2022 10:01:59 +0000
Subject: [PATCH] Integrate gitlab-ci/CI-gitlab-ci-merge-after-merge-fixes
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/3f293145ca987e3ea3bfb7b1530485167d011a77
CI: merge_gitlab_ci: Fix for merge.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 2aeb899..3f29314 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 2aeb899ae3a3ad32ccac3b15f7025d42de5d5dac
+Subproject commit 3f293145ca987e3ea3bfb7b1530485167d011a77
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a0bc14..4b619cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 2aeb899ae3a3ad32ccac3b15f7025d42de5d5dac
+ ref: 3f293145ca987e3ea3bfb7b1530485167d011a77
file: 'manifest-integration.yml'
variables:
--
GitLab