Skip to content

stable-v2.0: un-hardcode Zephyr container and SDK #5740

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.

Sign up for GitHub

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

Merged
lgirdwood merged 2 commits into from
Apr 27, 2022
Merged

stable-v2.0: un-hardcode Zephyr container and SDK #5740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3a0f59
xtensa-build-zephyr.sh: switch to new Zephyr branch sof/stable-v2.0
marc-hb Apr 27, 2022
fbc0efb
Revert ".github/zephyr: hardcode zephyr container version to v0.21.0"
marc-hb Apr 27, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/zephyr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ jobs:
# -e https_proxy=...
- name: build
run: docker run -v "$(pwd)":/workdir
docker.io/zephyrprojectrtos/zephyr-build:v0.21.0
docker.io/zephyrprojectrtos/zephyr-build:latest
./zephyr/docker-build.sh -- -DEXTRA_CFLAGS='-Werror'
4 changes: 2 additions & 2 deletions scripts/xtensa-build-zephyr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ west_init_update()
{
# Default Zephyr remote and branch if nothing passed on the
# command line.
local init_remote="${1:-https://github.com/zephyrproject-rtos/zephyr}"
local init_remote="${1:-https://github.com/thesofproject/zephyr}"

# This can be a branch, a 40-digit SHA or empty to fetch the
# default branch
local init_ref="${2:-fd089b361d8aebbcb49cca989444aaeb0b6fbb4d}"
local init_ref="${2:-sof/stable-v2.0}"

# git fetch accepts anything, even 40-digits SHA but git clone is
# less flexible. So we git clone the default branch first to get
Expand Down