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 a2888b75f2f4..8c655807f7af 100644 --- a/.github/workflows/llext.yml +++ b/.github/workflows/llext.yml @@ -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 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/sparse-zephyr.yml b/.github/workflows/sparse-zephyr.yml index e66856691dcb..8ddfa0fe0571 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 strategy: fail-fast: false 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 06b6cc3d7ee9..296996a62883 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 steps: - uses: actions/checkout@v4 with: @@ -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 @@ -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: @@ -285,12 +285,12 @@ 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 @@ -298,11 +298,11 @@ jobs: 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 @@ -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' - name: West install run: pip3 install west @@ -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 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"] diff --git a/west.yml b/west.yml index efa8f38a2f56..470a0df6d022 100644 --- a/west.yml +++ b/west.yml @@ -43,7 +43,7 @@ manifest: - name: zephyr repo-path: zephyr - revision: 653ebccc49ad1f79cae2729f4c6fabd5ff54d397 + revision: 70969f88f5373d8f99b2d1a2b9d85a4462df2ac8 remote: zephyrproject # Import some projects listed in zephyr/west.yml@revision diff --git a/zephyr/docker-run.sh b/zephyr/docker-run.sh index c8a4af7fd38e..e71e266d52b8 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 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 # @@ -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 "$@" }