From 482c0025475f9162c2923f5de9bdf798488fc605 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot.north@seco.com> Date: Fri, 19 Apr 2024 13:03:17 +0000 Subject: [PATCH] Integrate gitlab-ci/fix_supported_hardware and 1 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/dcc8d92b38fde9c4feb2268eefdf7b68b25bc25b build:hardware: Add Trizeps VIII Plus, fix MX93 and sort entries -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/add2bb178b57aacfdb730b14d1440253a687d2c3 Revert "CI: remove 'setup_ssh' as ssh access is disabled" The SSH setup is required for some private projects that pull in external repos via SSH. This reverts commit 4d5bca8fb8aaebf8794ffa88a6d0aef779c9eedf. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 19ff9d0..dcc8d92 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 19ff9d080b2b029cd7afe21cf4f530c8df2c4c71 +Subproject commit dcc8d92b38fde9c4feb2268eefdf7b68b25bc25b diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b02f8b7..d0ea544 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,9 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 19ff9d080b2b029cd7afe21cf4f530c8df2c4c71 + ref: dcc8d92b38fde9c4feb2268eefdf7b68b25bc25b file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: 19ff9d080b2b029cd7afe21cf4f530c8df2c4c71 + GITLAB_CI_REVISION: dcc8d92b38fde9c4feb2268eefdf7b68b25bc25b BB_RECIPE_NAME: atmel-mxt -- GitLab