From 201871b0abfcfab70735ba49ab49df51eb9ac2a5 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Fri, 20 Oct 2023 15:50:21 -0700 Subject: [PATCH 1/2] .github/zephyr: de-hardcode the name of the zephyr remote Fixes issue reported in stable-v2.7 #8353 which wants to use our own, downstream Zephyr branch. 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 25af4e96cd8a..eb8a5805410e 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -167,7 +167,7 @@ jobs: # both issues in no time. cd zephyr - git fetch --filter=tree:0 zephyrproject "$rem_rev":_branch_placeholder + git fetch --filter=tree:0 "$(git remote |head -n1)" "$rem_rev":_branch_placeholder git branch -D _branch_placeholder set -x From 0d61cb03708144f7ac2b2914e7b5a6459f0e093b Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Fri, 20 Oct 2023 15:53:35 -0700 Subject: [PATCH 2/2] .github/zephyr: time some fetch commands GitHub conveniently times each step but to reduce step proliferation we sometimes have multiple commands in a single step and lose the ability to time download commands. Prefix them with `time` to restore the data. Signed-off-by: Marc Herbert --- .github/workflows/zephyr.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index eb8a5805410e..402f53102015 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -133,7 +133,7 @@ jobs: - name: west clones run: pip3 install west && cd workspace/sof/ && west init -l && - west update --narrow --fetch-opt=--filter=tree:0 + time west update --narrow --fetch-opt=--filter=tree:0 - name: select zephyr revision run: | @@ -149,7 +149,7 @@ jobs: sed -e "s#=sof_zephyr_revision_override=#${rem_rev}#" \ sof-ci-jenkins/zephyr-override-template.yml > test-zephyr-main.yml ) - west update --narrow --fetch-opt=--filter=tree:0 + time west update --narrow --fetch-opt=--filter=tree:0 fi # Because we used git tricks to speed things up, we now have two git @@ -167,7 +167,7 @@ jobs: # both issues in no time. cd zephyr - git fetch --filter=tree:0 "$(git remote |head -n1)" "$rem_rev":_branch_placeholder + time git fetch --filter=tree:0 "$(git remote |head -n1)" "$rem_rev":_branch_placeholder git branch -D _branch_placeholder set -x