From a25ee90d75ac0e0faa7871a8e1d98ff3786cf7da Mon Sep 17 00:00:00 2001 From: gitbot <gitbot.north@seco.com> Date: Mon, 13 May 2024 14:08:38 +0000 Subject: [PATCH] Integrate gitlab-ci/fix_credentials_cache -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/cbf168ebd86b09d06b8d7d7e559e5bcedd0607dd build:credentials: Fix error when storing credentials in cache The credentials helper wasn't storing the credentials in the cache. Seemingly, the echo added whitespaces at the beginning of the lines which can't be interpreted by the git credential approve command. Also the USERNAME was renamed to TOKEN_USER because the variable is already filled with the system users name. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index d09e3a9655559..cbf168ebd86b0 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit d09e3a9655559495e9aeff194e3ea44a2acdb315 +Subproject commit cbf168ebd86b09d06b8d7d7e559e5bcedd0607dd diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ecca7e9c14c4..07f54e20d8222 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,9 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: d09e3a9655559495e9aeff194e3ea44a2acdb315 + ref: cbf168ebd86b09d06b8d7d7e559e5bcedd0607dd file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: d09e3a9655559495e9aeff194e3ea44a2acdb315 + GITLAB_CI_REVISION: cbf168ebd86b09d06b8d7d7e559e5bcedd0607dd BB_RECIPE_NAME: linux-seconorth -- GitLab