From 8cb73685629d40025de24d4d0f34d466e65d2120 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@seco.com> Date: Thu, 14 Sep 2023 10:01:59 +0000 Subject: [PATCH] Integrate gitlab-ci/remove-parsing-of-testdata-in-package and 3 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/45f2aca73b8c48f0c456030d884c7d4c0c4deda0 Refactoring: remove parsing of testdata.json in package stage Extract and save these variables in the build stage instead and explicitly pass them as arguments to the package script. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/8ca2487d06d3310ccd8af5a4fe7ee07587d64cb0 Move .simulate_build below .build_yocto -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/2808f067698773ff2838963ab12ddb33028a33b7 Fix build.env contents for simulated build -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/73d00715cede8e07a38bd903fcf0e244c748db7c Pretty print release metadata JSON file --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index f2a29f5..45f2aca 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit f2a29f53ec65534788ab0cc03a562bcffa6b2ffe +Subproject commit 45f2aca73b8c48f0c456030d884c7d4c0c4deda0 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5228e2c..b31859d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,9 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: f2a29f53ec65534788ab0cc03a562bcffa6b2ffe + ref: 45f2aca73b8c48f0c456030d884c7d4c0c4deda0 file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: f2a29f53ec65534788ab0cc03a562bcffa6b2ffe + GITLAB_CI_REVISION: 45f2aca73b8c48f0c456030d884c7d4c0c4deda0 BB_RECIPE_NAME: gfplatdetect -- GitLab