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/codestyle.yml
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
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-rc3

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 @@ -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
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
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
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-rc3

strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tools.yml
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
10 changes: 5 additions & 5 deletions .github/workflows/zephyr.yml
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-rc3
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-rc3

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-rc3
strategy:
fail-fast: false
matrix:
Expand Down
32 changes: 17 additions & 15 deletions scripts/docker_build/zephyr_lite/Dockerfile
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"]
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.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
#
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-rc3 \
./sof/scripts/sudo-cwd.sh "$@"
}

Expand Down
Loading