Skip to content

ci: bump zephyr lite version to v0.29.0 and zephyr-sdk to 1.0.0 #10649

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

Open
redzynix wants to merge 4 commits into
base: main
Choose a base branch
from
+43 −41
Open

ci: bump zephyr lite version to v0.29.0 and zephyr-sdk to 1.0.0 #10649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
067de05
west.yml: update zephyr to 70969f88f53
tmleman Mar 25, 2026
6ca8235
zephyr-lite: bump sdk to zephyr-sdk-1.0.0
redzynix Mar 24, 2026
2a55ff4
ci: bump zephyr-lite version to v0.29.0 across workflows
redzynix Mar 24, 2026
5119071
ci: bump ubuntu runners to 24.04
redzynix Mar 24, 2026
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/codestyle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on: [pull_request, workflow_call, workflow_dispatch]

jobs:
checkpatch:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

strategy:
fail-fast: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/llext.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ defaults:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
container:
image: thesofproject/zephyr-lite:v0.28.4
image: thesofproject/zephyr-lite:v0.29.0

strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ on:
jobs:

doxygen:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/repro-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on: [pull_request, workflow_dispatch, workflow_call]

jobs:
main:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rimage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

# Basic build test
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
# FIXME: add -Wpointer-arith
_CFLGS: -Werror -Wall -Wmissing-prototypes
Expand All @@ -46,7 +46,7 @@ jobs:

# cppcheck
cppcheck:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with: {submodules: recursive, fetch-depth: 0, filter: 'tree:0'}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sparse-zephyr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
# this in sync with it.
runs-on: ubuntu-24.04
container:
image: thesofproject/zephyr-lite:v0.28.4
image: thesofproject/zephyr-lite:v0.29.0

strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:


SOF-alsa-plugin:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with: {filter: 'tree:0'}
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/zephyr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
run:
shell: bash
container:
image: thesofproject/zephyr-lite:v0.28.4
image: thesofproject/zephyr-lite:v0.29.0
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -66,12 +66,12 @@ jobs:
# sof/scripts/xtensa-build-zephyr.py configuration script. Then this
# job will be disappear, folded back in the regular build-* jobs below.
LP64-WIP:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
defaults:
run:
shell: bash
container:
image: thesofproject/zephyr-lite:v0.28.4
image: thesofproject/zephyr-lite:v0.29.0

steps:
- uses: actions/checkout@v4
Expand All @@ -97,12 +97,12 @@ jobs:
-DEXTRA_AFLAGS=-Werror

build-linux:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
defaults:
run:
shell: bash
container:
image: thesofproject/zephyr-lite:v0.28.4
image: thesofproject/zephyr-lite:v0.29.0
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -285,24 +285,24 @@ jobs:

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

# 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.17.4
- name: Download Zephyr SDK 1.0.0
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.17.4/zephyr-sdk-0.17.4_windows-x86_64.7z
https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v1.0.0/zephyr-sdk-1.0.0_windows-x86_64_gnu.7z

# Unzips every .zip package to directory matching its name without extension
- name: Unzip downloaded packages
Expand All @@ -325,12 +325,12 @@ 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.17.4_windows-x86_64/zephyr-sdk-0.17.4/setup.cmd /t all /h /c
run: zephyr-sdk-1.0.0_windows-x86_64_gnu/zephyr-sdk-1.0.0/setup.cmd /t all /h /c

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'

Comment on lines 330 to 334
Copy link

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

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

Python is bumped to 3.12 in this job (was 3.10). Please note this in the PR description/title or add a short rationale in the workflow comments so CI behavior changes are easier to correlate later.

Copilot uses AI. Check for mistakes.
- name: West install
run: pip3 install west
Expand Down Expand Up @@ -367,7 +367,7 @@ jobs:
uses: actions/setup-python@v5
id: cache-python
with:
python-version: '3.10'
python-version: '3.12'
cache: 'pip'
cache-dependency-path: workspace/zephyr/scripts/requirements.txt
Comment on lines 367 to 372
Copy link

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

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

Same Python 3.12 bump repeated for the cached setup-python step. If the PR description is updated, consider mentioning the Python runtime bump once rather than relying on readers noticing both workflow edits.

Copilot uses AI. Check for mistakes.

Expand Down
32 changes: 17 additions & 15 deletions scripts/docker_build/zephyr_lite/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,31 @@
# Copyright(c) 2025 Intel Corporation. All rights reserved.

# Use zephyr-build as base image
FROM ghcr.io/zephyrproject-rtos/zephyr-build:v0.28.4 as base
FROM ghcr.io/zephyrproject-rtos/zephyr-build:v0.29.0 as base

# Remove additional toolchains.
# As this is not ideal solution there is a plan to build docker image without zephyr-build as the base
# and install only needed toolchains in the future.
USER root

RUN cd /opt/toolchains/zephyr-sdk-0.17.4 && \
rm -rvf arc* \
micro* \
mips* \
nios* \
risc* \
sparc* \
sysroots \
x86* \
xtensa-espressif* \
xtensa-sample* \
xtensa-dc233c*
RUN rm -rvf /opt/toolchains/zephyr-sdk-1.0.0/hosttools/sysroots && \
rm -rvf /opt/fvps && \
cd /opt/toolchains/zephyr-sdk-1.0.0/gnu && \
rm -rvf arc* \
micro* \
mips* \
nios* \
risc* \
sparc* \
x86* \
xtensa-espressif* \
xtensa-sample* \
xtensa-dc233c*

# Use ubuntu24.04 as base for zephyr-lite
FROM ubuntu:24.04 as zephyr-lite

# Copy needed files from base to zephyr-lite
# Copy only required files from base image to zephyr-lite
# /opt for toolchains and sdk
# /usr for binaries and libs
# /home for libs installed in .local
Expand All @@ -51,7 +52,8 @@ RUN /opt/python/venv/bin/pip install 'cmake>=3.21' jsonschema

# Set zephyr env variables
ENV PATH="/opt/python/venv/bin/:$PATH"
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-0.17.4
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-1.0.0
ENV ZSDK_VERSION=1.0.0
ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr

CMD ["/bin/bash", "-l"]
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ manifest:

- name: zephyr
repo-path: zephyr
revision: 653ebccc49ad1f79cae2729f4c6fabd5ff54d397
revision: 70969f88f5373d8f99b2d1a2b9d85a4462df2ac8
remote: zephyrproject
Comment on lines 44 to 47
Copy link

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

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

The PR title/description focuses on bumping the zephyr-lite container + Zephyr SDK, but this change also updates the pinned Zephyr manifest revision. Please mention this explicitly (or split it) to keep the PR intent easy to track.

Copilot uses AI. Check for mistakes.

# Import some projects listed in zephyr/west.yml@revision
Expand Down
6 changes: 3 additions & 3 deletions zephyr/docker-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ main()

run_command()
{
# zephyr-lite:v0.28.4 has /opt/toolchains/zephyr-sdk-0.17.4
# zephyr-lite:v0.28.4 is based on zephyr-build:v0.28.4
# zephyr-lite:v0.29.0 has /opt/toolchains/zephyr-sdk-1.0.0
# zephyr-lite:v0.29.0 is based on zephyr-build:v0.29.0
# https://hub.docker.com/r/zephyrprojectrtos/zephyr-build/tags
# https://hub.docker.com/r/thesofproject/zephyr-lite/tags
#
Expand All @@ -65,7 +65,7 @@ run_command()
--workdir /zep_workspace \
$SOF_DOCKER_RUN \
--env REAL_CC --env http_proxy --env https_proxy \
thesofproject/zephyr-lite:v0.28.4 \
thesofproject/zephyr-lite:v0.29.0 \
./sof/scripts/sudo-cwd.sh "$@"
}

Expand Down
Loading