Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable-2.7] west.yml: update Zephyr to sofproject stable-v2.7 #8353

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/zephyr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"SOF": {
"MAJOR": "2",
"MINOR": "7",
"MICRO": "0"
"MICRO": "1"
}
}
4 changes: 2 additions & 2 deletions west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
Loading