From 5e8a5064ddf70a56ed3d3d8881297d3bae1f6178 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Tue, 21 Mar 2023 21:57:58 -0700 Subject: [PATCH 1/2] .github/zephyr: test new fancy --filter=tree:0 cloning option Test new, fancy and impressive looking git --filter optimization on non-critical "manifest check". Extend it later to other checks if it hasn't caused any issue. https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/ https://github.com/zephyrproject-rtos/west/issues/638#issuecomment-1478925589 Signed-off-by: Marc Herbert --- .github/workflows/zephyr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index b13fa3676c15..89d6af0db769 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -37,7 +37,7 @@ jobs: pip3 install west cd workspace/sof/ west init -l - west update + west update --fetch-opt=--filter=tree:0 build-linux: runs-on: ubuntu-20.04 From 7d82f64cf5e04d9a93d72f54c458826b1861943c Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Tue, 21 Mar 2023 21:26:53 -0700 Subject: [PATCH 2/2] .github/zephyr.yml: add a temporary submodules/west consistency check Real-world experience has proved again that big READMEs are not enough, not even when they're only a couple lines away as the one added in commit 8fd351ea9aa6 ("west.yml: add warning to keep git submodules in sync"). Only some failure / red color stand a chance. It also seems some people rarely use "git status". This was discovered in commit d9eb16aa6655 ("cmake: add warning when git submodule changes are found") but is still surprising. Signed-off-by: Marc Herbert --- .github/workflows/zephyr.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 89d6af0db769..ff310851154d 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -39,6 +39,25 @@ jobs: west init -l west update --fetch-opt=--filter=tree:0 + # Temporary check until we change west.yml and stop nesting rimage + # and tomlc99 inside sof which will cleanly separate them from + # XTOS submodules and... temporarily break every CI, which is why + # it hasn't been done yet. + - name: git submodules consistency + run: | + + cd workspace/sof + git submodule update --init --recursive + + west update + if git status --porcelain=v2 | grep ^ ; then + git status + echo 'FAIL: inconsistency between git submodules and west.yml!' + echo 'See rimage comment in west.yml.' + echo 'Always use "git status"' + exit 1 + fi + build-linux: runs-on: ubuntu-20.04 strategy: