Skip to content
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
5 changes: 3 additions & 2 deletions .github/workflows/zephyr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ jobs:
# From time to time this will catch a git tag and change SOF_VERSION
with: {fetch-depth: 10, submodules: recursive}

# Note: env variables can be passed to the container with
# -e https_proxy=...
- name: build
run: docker run -v "$(pwd)":/workdir
-e ZEPHYR_SDK_INSTALL_DIR='/opt/toolchains/zephyr-sdk-0.13.1'
docker.io/zephyrprojectrtos/zephyr-build:v0.18.4
docker.io/zephyrprojectrtos/zephyr-build:latest
./zephyr/docker-build.sh -- -DEXTRA_CFLAGS='-Werror'
8 changes: 8 additions & 0 deletions zephyr/docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ test -e ./scripts/xtensa-build-zephyr.sh
sudo apt-get update
sudo apt-get -y install tree

# Unset stale ZEPHYR_SDK_INSTALL_DIR variable pointing to obsolete
# 0.12.4 as of container 0.18.x

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inaccurate comment fixed in followup #4819

unset ZEPHYR_SDK_INSTALL_DIR

# Zephyr's CMake does not look in /opt but it searches $HOME
ls -ld /opt/toolchains/zephyr-sdk-*
ln -s /opt/toolchains/zephyr-sdk-* ~/

if test -e zephyrproject; then
./scripts/xtensa-build-zephyr.sh -a "$@"
else
Expand Down