From fe680c9d978c6708041210248fa695eb0451d4fe Mon Sep 17 00:00:00 2001 From: gitbot <gitbot.north@seco.com> Date: Mon, 19 Feb 2024 11:08:27 +0000 Subject: [PATCH] Integrate gitlab-ci/fix_syntax and 2 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/e207c443f31cfbec0c76075aae3296cf68afafca gitlab-ci: Disable sourcery The sourcery plugin fails again due to a missing login. Disable it for now. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/a3d1e77c0fbe3164cfb71950bc953bb29a083f1d manifest:integration: Fix issue in trigger/include -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/b6e661928be30eeab2fd66290baa26f9b7dd0b34 pipelines:build: Add check to JSON generation Without the check, we have a race condition when building from sources outside of the Yocto group. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 42bfe4f..e207c44 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 42bfe4f0d8f51e894f64a2ffa59732d777c137b3 +Subproject commit e207c443f31cfbec0c76075aae3296cf68afafca diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2297444..bfc53d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,9 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 42bfe4f0d8f51e894f64a2ffa59732d777c137b3 + ref: e207c443f31cfbec0c76075aae3296cf68afafca file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: 42bfe4f0d8f51e894f64a2ffa59732d777c137b3 + GITLAB_CI_REVISION: e207c443f31cfbec0c76075aae3296cf68afafca BB_RECIPE_NAME: secure-element-examples -- GitLab