From 5b4ea47cc9efdf828ea7f0bb53ed468190ec4b61 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot.north@seco.com> Date: Thu, 21 Dec 2023 11:12:09 +0000 Subject: [PATCH] Integrate gitlab-ci/add_git_credentials_script and 2 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/42bfe4f0d8f51e894f64a2ffa59732d777c137b3 build:prepare: Add setup script for Git Credentials -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/24653ff886fcfa82201aaf6c3f2c4c00bdf92b26 build:machines: Add i.MX93 to the build job template -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/7aae72ea4d2f71db56b559ee1358b5dcc65577a5 Re-enable sourcery With the free open source plan, sourcery works only when called from the repository's root directory. Re-enable it by calling it from there. Also apply sourcery's suggestions to file generate_firmware_package.py, which did not exist before disabling sourcery. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 51e0cf6..42bfe4f 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 51e0cf67dc5961134ef4bd3e7a1b1659ab95dd63 +Subproject commit 42bfe4f0d8f51e894f64a2ffa59732d777c137b3 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f65d5b..6545769 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,8 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 51e0cf67dc5961134ef4bd3e7a1b1659ab95dd63 + ref: 42bfe4f0d8f51e894f64a2ffa59732d777c137b3 file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: 51e0cf67dc5961134ef4bd3e7a1b1659ab95dd63 + GITLAB_CI_REVISION: 42bfe4f0d8f51e894f64a2ffa59732d777c137b3 -- GitLab