From 1a953bc7453e9ddff998d17f09a03610ed9d0d7b Mon Sep 17 00:00:00 2001 From: gitbot <gitbot.north@seco.com> Date: Thu, 1 Aug 2024 06:55:15 +0000 Subject: [PATCH] Integrate gitlab-ci/yt-230-manifest-build-triggers-only-fngsystem -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/417b79efe375fbb25c666d15c4214e67f6a4875f YT-230: Fix Manifest Pipeline after "Improve Release" Changes The recent changes introduced new rules in manifest-pipeline-yocto.yml, which have overwritten the general rules defined in build-pipeline.yml. Use !reference to combine both sets of rules effectively. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index a7e07f1..417b79e 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit a7e07f1983701a13e41b0d43e061a59167509256 +Subproject commit 417b79efe375fbb25c666d15c4214e67f6a4875f diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d2a519..355da56 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,9 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: a7e07f1983701a13e41b0d43e061a59167509256 + ref: 417b79efe375fbb25c666d15c4214e67f6a4875f file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: a7e07f1983701a13e41b0d43e061a59167509256 + GITLAB_CI_REVISION: 417b79efe375fbb25c666d15c4214e67f6a4875f BB_RECIPE_NAME: secure-element-examples -- GitLab