Skip to content
Draft
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
2 changes: 1 addition & 1 deletion .github/workflows/build_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/close-stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ipc_fuzzer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/llext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ permissions:

jobs:
build:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
container:
image: thesofproject/zephyr-lite:v0.29.0
image: thesofproject/zephyr-lite:v0.29.3-rc1

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

doxygen:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/repro-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ permissions:

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

steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sof-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sparse-zephyr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ 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.0
image: thesofproject/zephyr-lite:v0.29.3-rc1

strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testbench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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'}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/zephyr-shell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ permissions:

jobs:
build:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
container:
image: thesofproject/zephyr-lite:v0.29.0
image: thesofproject/zephyr-lite:v0.29.3-rc1

strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zephyr-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/zephyr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -79,12 +79,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-24.04
runs-on: ubuntu-26.04
defaults:
run:
shell: bash
container:
image: thesofproject/zephyr-lite:v0.29.0
image: thesofproject/zephyr-lite:v0.29.3-rc1

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

build-linux:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
defaults:
run:
shell: bash
container:
image: thesofproject/zephyr-lite:v0.29.0
image: thesofproject/zephyr-lite:v0.29.3-rc1
strategy:
fail-fast: false
matrix:
Expand Down
14 changes: 7 additions & 7 deletions scripts/docker_build/zephyr_lite/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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* \
Expand All @@ -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
Expand Down Expand Up @@ -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"]
6 changes: 3 additions & 3 deletions zephyr/docker-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
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.29.0 \
thesofproject/zephyr-lite:v0.29.3-rc1 \
./sof/scripts/sudo-cwd.sh "$@"
}

Expand Down
Loading