From 46328292c46b5f514e224234c0a902ebc80a7ec5 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Mon, 28 Aug 2023 06:29:02 +0000 Subject: [PATCH] Integrate gitlab-ci/combine-to-build-pipeline-yml -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/b2fb3e93b33a2cb14b50d30bf02c03f23b20c391 Combine build-yocto.yml and and build-common.yml to build-pipeline.yml --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index e680870..b2fb3e9 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit e6808701407e3f72e97c3098657846cc901e5e9b +Subproject commit b2fb3e93b33a2cb14b50d30bf02c03f23b20c391 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8505b0..4857b5e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,9 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: e6808701407e3f72e97c3098657846cc901e5e9b + ref: b2fb3e93b33a2cb14b50d30bf02c03f23b20c391 file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: e6808701407e3f72e97c3098657846cc901e5e9b + GITLAB_CI_REVISION: b2fb3e93b33a2cb14b50d30bf02c03f23b20c391 BB_RECIPE_NAME: secure-element-examples -- GitLab