From 0f4a550b3f569435bc482fc57f299db57cc599a9 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Tue, 25 Jul 2023 13:22:22 +0000
Subject: [PATCH] Integrate gitlab-ci/add-variable-for-manual-builds and 2 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/8e72eac2621d2791214220ff11f6bc3be47c2356
Yocto build: add variable for manual builds
Instead of hard-coding the rules for manual builds in each actual job,
conditionally add this to the `buildbase` class and add a variable
`MANUAL_BUILD` to the according jobs.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/e6d719962b52339565e0ff1c3826192f170d9527
Yocto build: unify image and SDK build jobs
Image and SDK builds share a lot of similar code. Instead of having two
job classes `build_yocto_image` and `build_yocto_sdk` for these two
tasks, merge them into the base class `build_yocto` and make the
differences configurable via a variable.
The `dump_install_command` part of the script, which was not executed
for SDK builds, is always present now, but it's only executed if the
`INSTALLSCRIPT` variable is set, which is not the case for SDK builds.
The `collect_srcrevs` part of the script is executed in all cases. It
was not part of the SDK build before, but it's not less relevant there.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/f892500f71f6fb29d9cd0442a2824b045b095ebe
Yocto build: make main artifacts path configurable
Instead of specifying all possible artifacts paths and abusing the fact
that GitLab ignores non-existing paths during artifact upload, implement
a cleaner solution with a configurable path.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index c227e05..8e72eac 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit c227e0531a0b9c6a2b23f6ec27ad0afe4bdac8c2
+Subproject commit 8e72eac2621d2791214220ff11f6bc3be47c2356
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d764ad..db3832f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,9 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: c227e0531a0b9c6a2b23f6ec27ad0afe4bdac8c2
+ ref: 8e72eac2621d2791214220ff11f6bc3be47c2356
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: c227e0531a0b9c6a2b23f6ec27ad0afe4bdac8c2
+ GITLAB_CI_REVISION: 8e72eac2621d2791214220ff11f6bc3be47c2356
BB_RECIPE_NAME: qt-multi-screen-compositor
--
GitLab