From 470383fd0c6b89f666539ee6b2c8267fe731c585 Mon Sep 17 00:00:00 2001 From: Grzegorz Swiderski Date: Mon, 17 Feb 2025 12:03:50 +0100 Subject: [PATCH] ci: Enable sysbuild Kconfig compliance checks Pull in the new checks added to sdk-zephyr. Of these, make sure that only `SysbuildKconfigBasic` is enabled, just like with `KconfigBasic`. Signed-off-by: Grzegorz Swiderski --- .github/workflows/compliance.yml | 3 ++- west.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml index 5dfd09bc217f..f05bc768abdb 100644 --- a/.github/workflows/compliance.yml +++ b/.github/workflows/compliance.yml @@ -70,7 +70,8 @@ jobs: git log --pretty=oneline | head -n 10 # For now we run KconfigBasic, but we should transition to Kconfig $ZEPHYR_BASE/scripts/ci/check_compliance.py --annotate -e Kconfig \ - -e KconfigBasicNoModules -e ClangFormat -e Ruff -c origin/${BASE_REF}.. + -e KconfigBasicNoModules -e ClangFormat -e Ruff -e SysbuildKconfig \ + -e SysbuildKconfigBasicNoModules -c origin/${BASE_REF}.. - name: upload-results uses: actions/upload-artifact@v4 diff --git a/west.yml b/west.yml index 8291ea2f6a8a..485c71a05e8d 100644 --- a/west.yml +++ b/west.yml @@ -66,7 +66,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 0aa2141d605f3b39da2b541e2fe4595d58824080 + revision: pull/2507/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above