From 0455c5b5b1c1b73a4beacb7fe42e9fa921b49ec4 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot.north@seco.com> Date: Thu, 11 Apr 2024 07:49:34 +0000 Subject: [PATCH] Integrate gitlab-ci/lpag/c72nl_hotfix -- Commit: https://git.seco.com/edgehog/infrastructure/gitlab-ci/-/commit/6f901acf33b59ce458e6df0cac6c831e60d98bb9 [C72n] Fix in machine configuration * This commit fixes the build not working for C72nl device due to bug in logic of code creating gitlab-ci configuration file for each machine. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 400ff327edd876..6f901acf33b59c 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 400ff327edd87681f2f63133957e9816b792cf85 +Subproject commit 6f901acf33b59ce458e6df0cac6c831e60d98bb9 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ea42bcafd2e68..0c12452cb33780 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,11 +4,11 @@ # --------------------------------------------------------------------------------------- include: - project: 'edgehog/infrastructure/gitlab-ci' - ref: 400ff327edd87681f2f63133957e9816b792cf85 + ref: 6f901acf33b59ce458e6df0cac6c831e60d98bb9 file: 'layers-integration.yml' variables: - GITLAB_CI_REVISION: 400ff327edd87681f2f63133957e9816b792cf85 + GITLAB_CI_REVISION: 6f901acf33b59ce458e6df0cac6c831e60d98bb9 # FIXME: This is only necessary due to the following GitLab limitation: # https://gitlab.com/gitlab-org/gitlab/-/issues/209904 # As soon as this gets fixed upstream, the hard-coded branch name should be removed. -- GitLab