From 401c83c87c9d8a3fdb309d6b991b826d2bb293c6 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Mon, 20 Feb 2023 12:01:29 +0000
Subject: [PATCH] Integrate
 gitlab-ci/do-not-cancel-previous-pipelines-on-master and 1 more

--

Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/9d430fe85bd049af05210b103a55e69171c5994b

Manifest integration: do not cancel previous pipelines on master

--

Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/8b08a08396860aa736f38b41c5c28a6476d355b1

Fix error handling on merge

GitLab API has changed:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94164/diffs#diff-content-c201dae00b72426693ddcb40edf6005e7702e935
---
 .gitlab-ci     | 2 +-
 .gitlab-ci.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci b/.gitlab-ci
index a59a93a..9d430fe 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit a59a93a03ce80d179ecce8c5a3865b06f010a04c
+Subproject commit 9d430fe85bd049af05210b103a55e69171c5994b
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b47b235..e6ae987 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,11 @@
 # ---------------------------------------------------------------------------------------
 include:
   - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
-    ref: a59a93a03ce80d179ecce8c5a3865b06f010a04c
+    ref: 9d430fe85bd049af05210b103a55e69171c5994b
     file: 'manifest-integration.yml'
 
 variables:
-  GITLAB_CI_REVISION: a59a93a03ce80d179ecce8c5a3865b06f010a04c
+  GITLAB_CI_REVISION: 9d430fe85bd049af05210b103a55e69171c5994b
   BB_RECIPE_NAME: qt-multi-screen-compositor
   # FIXME: This is only necessary due to the following GitLab limitation:
   # https://gitlab.com/gitlab-org/gitlab/-/issues/209904
-- 
GitLab