diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 58ba753db144..dd9f10704b3e 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 zephyrproject "$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 diff --git a/versions.json b/versions.json index 0eb1020a09ea..748078ee8d87 100644 --- a/versions.json +++ b/versions.json @@ -2,6 +2,6 @@ "SOF": { "MAJOR": "2", "MINOR": "7", - "MICRO": "0" + "MICRO": "1" } } diff --git a/west.yml b/west.yml index 6ba4e0505898..b155b9c8eb3f 100644 --- a/west.yml +++ b/west.yml @@ -45,8 +45,8 @@ manifest: - name: zephyr repo-path: zephyr - revision: 5689916a70ad5c363bd7d5511b772ada90067d51 - remote: zephyrproject + revision: feaa6281b7fc8af6ed6099b2bc1955e3f9925493 + remote: thesofproject # Import some projects listed in zephyr/west.yml@revision #