Skip to content

Use Zephyr SDK 0.16.4 #8618

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
kv2019i merged 2 commits into from
Dec 14, 2023
Merged

Use Zephyr SDK 0.16.4 #8618

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
e9b2e08
workflows: Upgrade docker container to v0.26.6
dbaluta Dec 13, 2023
0470e21
.github/zephyr: Upgrade to Zephyr SDK 0.16.4
dbaluta Dec 13, 2023
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
12 changes: 6 additions & 6 deletions .github/workflows/zephyr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,24 +248,24 @@ jobs:

# Keep this SDK version identical to the one in
# sof/zephyr/docker-run.sh
- name: Cache Zephyr SDK 0.16.1
- name: Cache Zephyr SDK 0.16.4
id: cache-zephyr-sdk
uses: actions/cache@v3.0.11
with:
path: zephyr-sdk-0.16.1_windows-x86_64.7z
key: ${{ runner.os }}-cache-zephyr-sdk-0-16-1
path: zephyr-sdk-0.16.4_windows-x86_64.7z
key: ${{ runner.os }}-cache-zephyr-sdk-0-16-4

# Wget is needed by Zephyr SDK setup.cmd installation script
- name: Download wget
if: ${{ steps.cache-wget.outputs.cache-hit != 'true' }}
run: |
curl -L -O http://downloads.sourceforge.net/gnuwin32/wget-1.11.4-1-bin.zip

- name: Download Zephyr SDK 0.16.1
- name: Download Zephyr SDK 0.16.4
if: ${{ steps.cache-zephyr-sdk.outputs.cache-hit != 'true' }}
run: | # yamllint disable-line rule:line-length
curl -L -O `
https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_windows-x86_64.7z
https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_windows-x86_64.7z

# Unzips every .zip package to directory matching its name without extension
- name: Unzip downloaded packages
Expand All @@ -288,7 +288,7 @@ jobs:
# setup.cmd may not be called in from msys shell as it does not parse
# forward slash script input arguments correctly.
- name: Install Zephyr SDK
run: zephyr-sdk-0.16.1_windows-x86_64/zephyr-sdk-0.16.1/setup.cmd /t all /h /c
run: zephyr-sdk-0.16.4_windows-x86_64/zephyr-sdk-0.16.4/setup.cmd /t all /h /c

- name: Setup Python
uses: actions/setup-python@v4
Expand Down
8 changes: 4 additions & 4 deletions zephyr/docker-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
# use this script with a image other than the one officially tagged
# "latest", simply overwrite the official tag. Example:
#
# docker tag ghcr.io/zephyrproject-rtos/zephyr-build:v0.26.4
# docker tag ghcr.io/zephyrproject-rtos/zephyr-build:v0.26.6
# ghcr.io/zephyrproject-rtos/zephyr-build:latest
#
# "latest" is just a regular tag like "v0.26.4", it may or many not name
# "latest" is just a regular tag like "v0.26.6", it may or many not name
Copy link
Collaborator

@marc-hb marc-hb Dec 13, 2023

Choose a reason for hiding this comment

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

No big deal but this is unnecessary churn which could git conflict.

# the most recent image.
#
# To automatically restore the official "latest" tag, just delete it:
Expand Down Expand Up @@ -54,7 +54,7 @@ main()

run_command()
{
# zephyr-build:v0.26.4 has /opt/toolchains/zephyr-sdk-0.16.1
# zephyr-build:v0.26.6 has /opt/toolchains/zephyr-sdk-0.16.4
# https://hub.docker.com/r/zephyrprojectrtos/zephyr-build/tags
#
# Keep this SDK version identical to the one in
Expand All @@ -63,7 +63,7 @@ run_command()
--workdir /zep_workspace \
$SOF_DOCKER_RUN \
--env REAL_CC --env http_proxy --env https_proxy \
ghcr.io/zephyrproject-rtos/zephyr-build:v0.26.4 \
ghcr.io/zephyrproject-rtos/zephyr-build:v0.26.6 \
./sof/scripts/sudo-cwd.sh "$@"
}

Expand Down