From 006caba2da71d5a3b554f4df7679794f804b78f3 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Tue, 28 Feb 2023 14:57:06 +0000
Subject: [PATCH] Integrate gitlab-ci/switch-to-mr-pipelines and 3 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/d67898a2a092096eecddcfa4d42cd740c6959be1
Manifest: skip build if "skip build" label is set
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/bffc60970e4556e3b46a907244861bdf8bfcf571
Manifest: switch from branch pipelines to merge request pipelines
This will make the manifest project support the "skip build" label.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/5ba1ac68f58a4a04799c2e45a4d744ce9a42a93f
Revert "Skip build if "skip build" label is set"
This reverts commit 4db257d36052c74eabed7ef43a05d98d3998ffec.
It does not work on the manifest, because we do not run merge request
pipelines there, so CI_MERGE_REQUEST_LABELS is not set at all.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/4db257d36052c74eabed7ef43a05d98d3998ffec
Skip build if "skip build" label is set
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 9d430fe..d67898a 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 9d430fe85bd049af05210b103a55e69171c5994b
+Subproject commit d67898a2a092096eecddcfa4d42cd740c6959be1
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6ae987..a7cb42d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,11 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 9d430fe85bd049af05210b103a55e69171c5994b
+ ref: d67898a2a092096eecddcfa4d42cd740c6959be1
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: 9d430fe85bd049af05210b103a55e69171c5994b
+ GITLAB_CI_REVISION: d67898a2a092096eecddcfa4d42cd740c6959be1
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