From b8340221807a2dde4ac10ac641bc3b83ba6bca77 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Fri, 20 May 2022 11:50:49 +0000 Subject: [PATCH] Integrate gitlab-ci/fix-gitlab-ci-integration and 5 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/6f09c66c167965b172141c188760d21bd2bb7c04 CI: deploy-gitlab-ci: Don't stop integration when one project is already updated Prior to this change the integration stop when one of the projects had already the latest ref of gitlab-ci in to submodule. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/6c39166fad1f1296e05475a65b5bba65f8535ae8 CI: deploy-gitlab-ci: Don't stop integration when one project is already updated Prior to this change the integration stop when one of the projects had already the latest ref of gitlab-ci in to submodule. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/aaac8d1c7aa9d7ff4cb062160fa1d2dd2a42501c changelog_generator: Use logging instead of print, fix black -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/79afb233b108b4a71f52874edbfea11b639f55cd CI: Move changelog_generator to gitlab-ci project The script can also be run in the normal python container, so this slightly reduces the complexity. -- 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..6f09c66 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 751fc360fbf4883043557cdc7f6c5a5da558c6c0 +Subproject commit 6f09c66c167965b172141c188760d21bd2bb7c04 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4dd808..3995580 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: 6f09c66c167965b172141c188760d21bd2bb7c04 file: 'manifest-integration.yml' variables: -- GitLab