From 364c1ecdf980a71fbe5a310ef1918df16b84c585 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot.north@seco.com> Date: Mon, 13 May 2024 11:20:46 +0000 Subject: [PATCH] Integrate gitlab-ci/generate-package-add-name2 and 2 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/d09e3a9655559495e9aeff194e3ea44a2acdb315 CI: generate_firmware: Add releasename as name to json file To use the generated json file in the json-fwr tooling, it helps to fill the name. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c2cd3b434cce3c6d475555d5593b77ee28932482 pipeline:confluence: Add parent for Flash-N-Go release page -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/887db0df7a8cb9fcd3f2684a8faa1aad637e9d84 pipelines: Add wic.img files to supported artefacts --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 54f17a6909d38..d09e3a9655559 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 54f17a6909d389e7eb84facd9772bd033b491d84 +Subproject commit d09e3a9655559495e9aeff194e3ea44a2acdb315 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a59eb4216cfa..2865b247e6032 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,11 +4,11 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 54f17a6909d389e7eb84facd9772bd033b491d84 + ref: d09e3a9655559495e9aeff194e3ea44a2acdb315 file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: 54f17a6909d389e7eb84facd9772bd033b491d84 + GITLAB_CI_REVISION: d09e3a9655559495e9aeff194e3ea44a2acdb315 BB_RECIPE_NAME: linux-seco-mtk # FIXME: This is only necessary due to the following GitLab limitation: # https://gitlab.com/gitlab-org/gitlab/-/issues/209904 -- GitLab