From a61cb5b25748343cc52bea8811724af9b23a9ee7 Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia Date: Tue, 24 Mar 2026 11:18:18 +0000 Subject: [PATCH 1/3] zephyr-lite: bump sdk to zephyr-sdk-1.0.0 Upgrade zephyr-base to v0.29.0 and bump sdk to zephyr-sdk-1.0.0 Signed-off-by: Mateusz Redzynia --- scripts/docker_build/zephyr_lite/Dockerfile | 32 +++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/scripts/docker_build/zephyr_lite/Dockerfile b/scripts/docker_build/zephyr_lite/Dockerfile index fb891468e5e9..c6d6e28159c8 100644 --- a/scripts/docker_build/zephyr_lite/Dockerfile +++ b/scripts/docker_build/zephyr_lite/Dockerfile @@ -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 @@ -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"] From e046dee9e0b1c4cc7ccd6c01be7c897c44f77547 Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia Date: Tue, 24 Mar 2026 11:19:59 +0000 Subject: [PATCH 2/3] ci: bump zephyr-lite version to v0.29.0 across workflows Bump zephyr-lite version to v0.29.0 across workflows Signed-off-by: Mateusz Redzynia --- .github/workflows/llext.yml | 2 +- .github/workflows/sparse-zephyr.yml | 2 +- .github/workflows/zephyr.yml | 6 +++--- zephyr/docker-run.sh | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/llext.yml b/.github/workflows/llext.yml index a2888b75f2f4..5d888babdb28 100644 --- a/.github/workflows/llext.yml +++ b/.github/workflows/llext.yml @@ -15,7 +15,7 @@ jobs: build: runs-on: ubuntu-22.04 container: - image: thesofproject/zephyr-lite:v0.28.4 + image: thesofproject/zephyr-lite:v0.29.0-rc3 strategy: fail-fast: false diff --git a/.github/workflows/sparse-zephyr.yml b/.github/workflows/sparse-zephyr.yml index e66856691dcb..090932fdd7f6 100644 --- a/.github/workflows/sparse-zephyr.yml +++ b/.github/workflows/sparse-zephyr.yml @@ -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-rc3 strategy: fail-fast: false diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 06b6cc3d7ee9..50a2d2b53e9a 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -21,7 +21,7 @@ jobs: run: shell: bash container: - image: thesofproject/zephyr-lite:v0.28.4 + image: thesofproject/zephyr-lite:v0.29.0-rc3 steps: - uses: actions/checkout@v4 with: @@ -71,7 +71,7 @@ jobs: run: shell: bash container: - image: thesofproject/zephyr-lite:v0.28.4 + image: thesofproject/zephyr-lite:v0.29.0-rc3 steps: - uses: actions/checkout@v4 @@ -102,7 +102,7 @@ jobs: run: shell: bash container: - image: thesofproject/zephyr-lite:v0.28.4 + image: thesofproject/zephyr-lite:v0.29.0-rc3 strategy: fail-fast: false matrix: diff --git a/zephyr/docker-run.sh b/zephyr/docker-run.sh index c8a4af7fd38e..d0d80d4fd9c0 100755 --- a/zephyr/docker-run.sh +++ b/zephyr/docker-run.sh @@ -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-rc3 has /opt/toolchains/zephyr-sdk-1.0.0 + # zephyr-lite:v0.29.0-rc3 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 # @@ -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-rc3 \ ./sof/scripts/sudo-cwd.sh "$@" } From 39470e1911307337a3f4e32b51b3fa0db0c4eb19 Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia Date: Tue, 24 Mar 2026 11:28:17 +0000 Subject: [PATCH 3/3] ci: bump ubuntu runners to 24.04 Bump ubuntu runners to 24.04 Signed-off-by: Mateusz Redzynia --- .github/workflows/codestyle.yml | 2 +- .github/workflows/llext.yml | 2 +- .github/workflows/pull-request.yml | 2 +- .github/workflows/repro-build.yml | 2 +- .github/workflows/rimage.yml | 4 ++-- .github/workflows/tools.yml | 2 +- .github/workflows/zephyr.yml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml index 63a076fc086a..7137a4eff559 100644 --- a/.github/workflows/codestyle.yml +++ b/.github/workflows/codestyle.yml @@ -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 diff --git a/.github/workflows/llext.yml b/.github/workflows/llext.yml index 5d888babdb28..504e6243dde3 100644 --- a/.github/workflows/llext.yml +++ b/.github/workflows/llext.yml @@ -13,7 +13,7 @@ defaults: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 container: image: thesofproject/zephyr-lite:v0.29.0-rc3 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 886d1b328ba7..eab5c9b912ec 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -34,7 +34,7 @@ on: jobs: doxygen: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/repro-build.yml b/.github/workflows/repro-build.yml index 034ae4ac286a..3c32ba0fd122 100644 --- a/.github/workflows/repro-build.yml +++ b/.github/workflows/repro-build.yml @@ -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 diff --git a/.github/workflows/rimage.yml b/.github/workflows/rimage.yml index b6e66c23c449..9aa02671f200 100644 --- a/.github/workflows/rimage.yml +++ b/.github/workflows/rimage.yml @@ -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 @@ -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'} diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml index 9c8197a6cbcc..e370ffd95a91 100644 --- a/.github/workflows/tools.yml +++ b/.github/workflows/tools.yml @@ -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'} diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 50a2d2b53e9a..71b2b1a21940 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -66,7 +66,7 @@ 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 @@ -97,7 +97,7 @@ jobs: -DEXTRA_AFLAGS=-Werror build-linux: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 defaults: run: shell: bash