From af34fc6d61b71a18ace869768326d2d7989aeadf Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Mon, 16 May 2022 07:37:50 +0000 Subject: [PATCH] Integrate gitlab-ci/add_qt-multi-screen-compositor_project and 1 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/383a5acaebfd9cfa006cca35f0480b8972643a57 Added qt-multi-screen-compositor to project list -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3e88ad8eace46f5671586c9dc17a4c2ad3ea9cb7 buildfng: Moved the image and distro variables to global The image and distro for the buildfng job can now be set via global/external variables. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 751fc36..383a5ac 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 751fc360fbf4883043557cdc7f6c5a5da558c6c0 +Subproject commit 383a5acaebfd9cfa006cca35f0480b8972643a57 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4dd808..ce4f8d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: bcb6076bc67279ac451d5d0d3449bbc89c4830d6 + ref: 383a5acaebfd9cfa006cca35f0480b8972643a57 file: 'manifest-integration.yml' variables: -- GitLab