From 93af0edb774b8a58cbd0f268994a9ab95833424d Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia Date: Fri, 14 Aug 2026 18:43:41 +0200 Subject: [PATCH 1/3] zephyr-lite: bump ubuntu to 26.04 and sdk to zephyr-sdk-1.0.1 Upgrade: - ubuntu to 26.04 - zephyr-base to v0.29.3 - zephyr-sdk to zephyr-sdk-1.0.1 Signed-off-by: Mateusz Redzynia --- scripts/docker_build/zephyr_lite/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/docker_build/zephyr_lite/Dockerfile b/scripts/docker_build/zephyr_lite/Dockerfile index c6d6e28159c8..0ff9cee45a94 100644 --- a/scripts/docker_build/zephyr_lite/Dockerfile +++ b/scripts/docker_build/zephyr_lite/Dockerfile @@ -2,16 +2,16 @@ # Copyright(c) 2025 Intel Corporation. All rights reserved. # Use zephyr-build as base image -FROM ghcr.io/zephyrproject-rtos/zephyr-build:v0.29.0 as base +FROM ghcr.io/zephyrproject-rtos/zephyr-build:v0.29.3 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 rm -rvf /opt/toolchains/zephyr-sdk-1.0.0/hosttools/sysroots && \ +RUN rm -rvf /opt/toolchains/zephyr-sdk-1.0.1/hosttools/sysroots && \ rm -rvf /opt/fvps && \ - cd /opt/toolchains/zephyr-sdk-1.0.0/gnu && \ + cd /opt/toolchains/zephyr-sdk-1.0.1/gnu && \ rm -rvf arc* \ micro* \ mips* \ @@ -23,8 +23,8 @@ RUN rm -rvf /opt/toolchains/zephyr-sdk-1.0.0/hosttools/sysroots && \ xtensa-sample* \ xtensa-dc233c* -# Use ubuntu24.04 as base for zephyr-lite -FROM ubuntu:24.04 as zephyr-lite +# Use ubuntu26.04 as base for zephyr-lite +FROM ubuntu:26.04 as zephyr-lite # Copy only required files from base image to zephyr-lite # /opt for toolchains and sdk @@ -52,8 +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-1.0.0 -ENV ZSDK_VERSION=1.0.0 +ENV ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-1.0.1 +ENV ZSDK_VERSION=1.0.1 ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr CMD ["/bin/bash", "-l"] From c3dadfe04e07e8a3ed8c673a0fd22c40a97a77a2 Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia Date: Fri, 14 Aug 2026 18:46:56 +0200 Subject: [PATCH 2/3] [DNM] ci: bump zephyr-lite version to v0.29.3-rc1 across workflows Bump zephyr-lite version to v0.29.3-rc1 across workflows Signed-off-by: Mateusz Redzynia --- .github/workflows/llext.yml | 2 +- .github/workflows/sparse-zephyr.yml | 2 +- .github/workflows/zephyr-shell.yml | 2 +- .github/workflows/zephyr.yml | 6 +++--- zephyr/docker-run.sh | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/llext.yml b/.github/workflows/llext.yml index 149c9e2e3571..7f7f76d6fc1d 100644 --- a/.github/workflows/llext.yml +++ b/.github/workflows/llext.yml @@ -18,7 +18,7 @@ jobs: build: runs-on: ubuntu-24.04 container: - image: thesofproject/zephyr-lite:v0.29.0 + image: thesofproject/zephyr-lite:v0.29.3-rc1 strategy: fail-fast: false diff --git a/.github/workflows/sparse-zephyr.yml b/.github/workflows/sparse-zephyr.yml index 5afa6361f51a..2360a62cee48 100644 --- a/.github/workflows/sparse-zephyr.yml +++ b/.github/workflows/sparse-zephyr.yml @@ -29,7 +29,7 @@ jobs: # this in sync with it. runs-on: ubuntu-24.04 container: - image: thesofproject/zephyr-lite:v0.29.0 + image: thesofproject/zephyr-lite:v0.29.3-rc1 strategy: fail-fast: false diff --git a/.github/workflows/zephyr-shell.yml b/.github/workflows/zephyr-shell.yml index 23f8e6947b22..132f3cd66121 100644 --- a/.github/workflows/zephyr-shell.yml +++ b/.github/workflows/zephyr-shell.yml @@ -27,7 +27,7 @@ jobs: build: runs-on: ubuntu-24.04 container: - image: thesofproject/zephyr-lite:v0.29.0 + image: thesofproject/zephyr-lite:v0.29.3-rc1 strategy: fail-fast: false diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index ecfc6f4089ee..6b79a468ad6e 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -34,7 +34,7 @@ jobs: run: shell: bash container: - image: thesofproject/zephyr-lite:v0.29.0 + image: thesofproject/zephyr-lite:v0.29.3-rc1 steps: - uses: actions/checkout@v4 with: @@ -84,7 +84,7 @@ jobs: run: shell: bash container: - image: thesofproject/zephyr-lite:v0.29.0 + image: thesofproject/zephyr-lite:v0.29.3-rc1 steps: - uses: actions/checkout@v4 @@ -115,7 +115,7 @@ jobs: run: shell: bash container: - image: thesofproject/zephyr-lite:v0.29.0 + image: thesofproject/zephyr-lite:v0.29.3-rc1 strategy: fail-fast: false matrix: diff --git a/zephyr/docker-run.sh b/zephyr/docker-run.sh index e71e266d52b8..d8571028e228 100755 --- a/zephyr/docker-run.sh +++ b/zephyr/docker-run.sh @@ -54,8 +54,8 @@ main() run_command() { - # 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 + # zephyr-lite:v0.29.3-rc1 has /opt/toolchains/zephyr-sdk-1.0.0 + # zephyr-lite:v0.29.3-rc1 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.29.0 \ + thesofproject/zephyr-lite:v0.29.3-rc1 \ ./sof/scripts/sudo-cwd.sh "$@" } From c7b53d2fb8b9b1ac9f0c707ef73972543df35cef Mon Sep 17 00:00:00 2001 From: Mateusz Redzynia Date: Fri, 14 Aug 2026 18:48:21 +0200 Subject: [PATCH 3/3] [DNM] ci: bump ubuntu runners to 26.04 Bump ubuntu runners to 26.04 Signed-off-by: Mateusz Redzynia --- .github/workflows/build_all.yml | 2 +- .github/workflows/close-stale.yml | 2 +- .github/workflows/ipc_fuzzer.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/sof-docs.yml | 2 +- .github/workflows/sparse-zephyr.yml | 2 +- .github/workflows/testbench.yml | 2 +- .github/workflows/tools.yml | 4 ++-- .github/workflows/zephyr-shell.yml | 2 +- .github/workflows/zephyr-unit-tests.yml | 2 +- .github/workflows/zephyr.yml | 4 ++-- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 19fee4a98ca4..0474e82759ba 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -14,7 +14,7 @@ permissions: jobs: stub-build: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 strategy: matrix: # Keep these names short due to questionable Github UI choices diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml index 052878a5cdd2..e680dc31c604 100644 --- a/.github/workflows/close-stale.yml +++ b/.github/workflows/close-stale.yml @@ -12,7 +12,7 @@ permissions: jobs: stale: name: Find stale issues - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 if: github.repository == 'thesofproject/sof' permissions: issues: write diff --git a/.github/workflows/ipc_fuzzer.yml b/.github/workflows/ipc_fuzzer.yml index f52291839111..d5e7480d511a 100644 --- a/.github/workflows/ipc_fuzzer.yml +++ b/.github/workflows/ipc_fuzzer.yml @@ -28,7 +28,7 @@ permissions: jobs: simple-IPC-fuzz_sh: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 strategy: fail-fast: false matrix: diff --git a/.github/workflows/llext.yml b/.github/workflows/llext.yml index 7f7f76d6fc1d..e009c0452b93 100644 --- a/.github/workflows/llext.yml +++ b/.github/workflows/llext.yml @@ -16,7 +16,7 @@ permissions: jobs: build: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 container: image: thesofproject/zephyr-lite:v0.29.3-rc1 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 0bd3865dec97..94c2341b967e 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -37,7 +37,7 @@ permissions: jobs: doxygen: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/repro-build.yml b/.github/workflows/repro-build.yml index abe48a8cecb2..2f0d8bafc0eb 100644 --- a/.github/workflows/repro-build.yml +++ b/.github/workflows/repro-build.yml @@ -19,7 +19,7 @@ permissions: jobs: main: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/rimage.yml b/.github/workflows/rimage.yml index 53059681ae9d..947581fe8d4c 100644 --- a/.github/workflows/rimage.yml +++ b/.github/workflows/rimage.yml @@ -29,7 +29,7 @@ jobs: # Basic build test build: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 env: # FIXME: add -Wpointer-arith _CFLGS: -Werror -Wall -Wmissing-prototypes @@ -49,7 +49,7 @@ jobs: # cppcheck cppcheck: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 steps: - uses: actions/checkout@v4 with: {submodules: recursive, fetch-depth: 0, filter: 'tree:0'} diff --git a/.github/workflows/sof-docs.yml b/.github/workflows/sof-docs.yml index 63af4acfc714..bf8219ba3ea5 100644 --- a/.github/workflows/sof-docs.yml +++ b/.github/workflows/sof-docs.yml @@ -29,7 +29,7 @@ jobs: # example in # https://github.com/thesofproject/sof/pull/5731#issuecomment-1175630147 sof-docs: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/sparse-zephyr.yml b/.github/workflows/sparse-zephyr.yml index 2360a62cee48..5d44e7da107e 100644 --- a/.github/workflows/sparse-zephyr.yml +++ b/.github/workflows/sparse-zephyr.yml @@ -27,7 +27,7 @@ jobs: # We're sharing the sparse binary with the zephyr-build container so keep # this in sync with it. - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 container: image: thesofproject/zephyr-lite:v0.29.3-rc1 diff --git a/.github/workflows/testbench.yml b/.github/workflows/testbench.yml index d54b1db331db..024d85e2f193 100644 --- a/.github/workflows/testbench.yml +++ b/.github/workflows/testbench.yml @@ -33,7 +33,7 @@ permissions: jobs: build-and-test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 steps: - name: Checkout SOF repository (PR source) diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml index 825b571321d8..a60714446dcf 100644 --- a/.github/workflows/tools.yml +++ b/.github/workflows/tools.yml @@ -13,7 +13,7 @@ permissions: jobs: # This is not the same as building every ./build-tools.sh option. top-level_default_CMake_target_ALL: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 steps: - uses: actions/checkout@v4 with: @@ -81,7 +81,7 @@ jobs: SOF-alsa-plugin: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 steps: - uses: actions/checkout@v4 with: {filter: 'tree:0'} diff --git a/.github/workflows/zephyr-shell.yml b/.github/workflows/zephyr-shell.yml index 132f3cd66121..8026e71e6a20 100644 --- a/.github/workflows/zephyr-shell.yml +++ b/.github/workflows/zephyr-shell.yml @@ -25,7 +25,7 @@ permissions: jobs: build: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 container: image: thesofproject/zephyr-lite:v0.29.3-rc1 diff --git a/.github/workflows/zephyr-unit-tests.yml b/.github/workflows/zephyr-unit-tests.yml index ed089a148597..c74a7031614d 100644 --- a/.github/workflows/zephyr-unit-tests.yml +++ b/.github/workflows/zephyr-unit-tests.yml @@ -17,7 +17,7 @@ concurrency: jobs: zephyr-utests: name: Zephyr Unit Tests (ZTest) - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 timeout-minutes: 10 steps: diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 6b79a468ad6e..c7d6924db34c 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -79,7 +79,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-24.04 + runs-on: ubuntu-26.04 defaults: run: shell: bash @@ -110,7 +110,7 @@ jobs: -DEXTRA_AFLAGS=-Werror build-linux: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 defaults: run: shell: bash