Skip to content

ci: bump zephyr lite version to v0.29.0 and zephyr-sdk to 1.0.0#10649

Merged
lgirdwood merged 4 commits intothesofproject:mainfrom
redzynix:bump-zephyr-lite-version-to-v0.29.0
Mar 27, 2026
Merged

ci: bump zephyr lite version to v0.29.0 and zephyr-sdk to 1.0.0#10649
lgirdwood merged 4 commits intothesofproject:mainfrom
redzynix:bump-zephyr-lite-version-to-v0.29.0

Conversation

@redzynix
Copy link
Copy Markdown
Contributor

@redzynix redzynix commented Mar 24, 2026

@redzynix redzynix force-pushed the bump-zephyr-lite-version-to-v0.29.0 branch from ef49495 to 39470e1 Compare March 24, 2026 11:35
@dbaluta
Copy link
Copy Markdown
Collaborator

dbaluta commented Mar 24, 2026

@lyakh @lgirdwood

Should we also bump zephyr version to at least:

ommit a69b8062ecb46c0fe55038d48080af235ffe5e99
Author: Stephanos Ioannidis <root@stephanos.io>
Date:   Fri Mar 13 15:30:01 2026 +0900

    SDK_VERSION: Use Zephyr SDK 1.0.0
    
    This commit updates SDK_VERSION to point to the Zephyr SDK 1.0.0 release.
    
    Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

So that SOF will use the new SDK 1.0.0.?

@kv2019i
Copy link
Copy Markdown
Collaborator

kv2019i commented Mar 25, 2026

@redzynix Can you add Zephyr west.yml update to commit "ci: bump zephyr-lite version to v0.29.0 across workflows" and repush this PR? This should then pass the CI runs (using new SDK and new version of Zephyr). If CI is good, we can then merge this.

tmleman and others added 2 commits March 25, 2026 12:34
Total of 2864 commits.

Changes include:

73075d7c754 xtensa: mmu: Update K_MEM_PARTITION_P_RW_U_NA macro
465f488b6ab logging: mtrace: Enable thread ID prefix support
4f7a485af7b logging: mtrace: Enable core ID prefix support
e254a97cf15 logging: add CONFIG_LOG_CORE_ID_PREFIX for multicore systems
616a0a6ab10 intel_adsp: ace4: adsp_power.h: Declare
            intel_adsp_clock_soft_off_exit()
ee0cc5a6205 arch: xtensa: Add XTENSA_BACKTRACE_EXCEPTION_DUMP_HOOK
            Kconfig option
8655e64cae6 arch: exception: Add Kconfig EXCEPTION_DUMP_HOOK_ONLY
9446b09ff24 arch: xtensa: Use exception dump hook helpers in exception
            dumping
499cdcd51cd arch: exception: Add hooks for delivering exception dumps
11f89f73ebb kernel: userspace: Add k_object_access_check syscall
890eb11be93 llext: memblk kconfigs in docs
8bcc333e65f llext: custom sections for heap
c8b9adaec98 drivers: dai: intel: uaol: fix linker error
93a25f7b244 xtensa: set is_fatal_error before stack bound check
9842b062bb2 cpuidle: optimize out weak stub function call for !TRACING
224f5f74c47 pm: device: Refine device driver initialization
de97ddb0e83 pm: device: Refactor power domain add/remove logic
ce3343422bf drivers: uaol: add streams mapping retrieval
e1a48417274 dts: intel_adsp: add UAOL device for ACE4
33b482235a6 drivers: dai: intel: uaol: add a driver for Intel UAOL DAI
b50fcbd6eee drivers: uaol: add a driver for Intel UAOL IP
2e9f09e12dd pm: policy: change 'greater than or equal' to 'greater than'
5800f4e2fe1 pm: policy: move pm_policy_device_is_disabling_state()
            declaration
9834dac28ad pm: policy: add NULL callback support for latency
            subscriptions
2865d5ce0d5 pm: policy: replace DT_PROP_LEN with ARRAY_SIZE
af746bc8400 pm: policy: Improve the event implementation

Signed-off-by: Tomasz Leman <tomasz.m.leman@intel.com>
Upgrade zephyr-base to v0.29.0 and bump sdk to zephyr-sdk-1.0.0

Signed-off-by: Mateusz Redzynia <mateuszx.redzynia@intel.com>
@redzynix redzynix force-pushed the bump-zephyr-lite-version-to-v0.29.0 branch 3 times, most recently from 2d37898 to 5119071 Compare March 25, 2026 13:09
@redzynix redzynix marked this pull request as ready for review March 25, 2026 13:24
Copilot AI review requested due to automatic review settings March 25, 2026 13:24
@redzynix
Copy link
Copy Markdown
Contributor Author

@redzynix Can you add Zephyr west.yml update to commit "ci: bump zephyr-lite version to v0.29.0 across workflows" and repush this PR? This should then pass the CI runs (using new SDK and new version of Zephyr). If CI is good, we can then merge this.

Commit cherry-picked.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the Zephyr CI/container toolchain baseline used by SOF to the latest zephyr-lite image and Zephyr SDK, aligning GitHub Actions workflows and the west manifest accordingly.

Changes:

  • Bump thesofproject/zephyr-lite usage to v0.29.0 across local scripts and CI, and base the custom image on zephyr-build:v0.29.0.
  • Update Zephyr SDK references to 1.0.0 (Dockerfile env + Windows CI download/cache/install).
  • Update the pinned Zephyr module revision in west.yml and refresh CI runners to ubuntu-24.04 (plus Windows Python to 3.12).

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
zephyr/docker-run.sh Switches local docker runner to zephyr-lite:v0.29.0 and updates SDK version comments.
west.yml Updates the pinned Zephyr project revision SHA.
scripts/docker_build/zephyr_lite/Dockerfile Rebases image on zephyr-build:v0.29.0, prunes SDK contents, and sets SDK env vars for 1.0.0.
.github/workflows/zephyr.yml Uses zephyr-lite:v0.29.0, updates Linux runners to 24.04, updates Windows SDK to 1.0.0 and Python to 3.12.
.github/workflows/tools.yml Updates runner image to ubuntu-24.04.
.github/workflows/sparse-zephyr.yml Uses zephyr-lite:v0.29.0 in the container job.
.github/workflows/rimage.yml Updates runner image to ubuntu-24.04.
.github/workflows/repro-build.yml Updates runner image to ubuntu-24.04.
.github/workflows/pull-request.yml Updates runner image to ubuntu-24.04.
.github/workflows/llext.yml Updates runner to ubuntu-24.04 and container to zephyr-lite:v0.29.0.
.github/workflows/codestyle.yml Updates runner image to ubuntu-24.04.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines 44 to 47
- name: zephyr
repo-path: zephyr
revision: 653ebccc49ad1f79cae2729f4c6fabd5ff54d397
revision: 70969f88f5373d8f99b2d1a2b9d85a4462df2ac8
remote: zephyrproject
Copy link

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR title/description focuses on bumping the zephyr-lite container + Zephyr SDK, but this change also updates the pinned Zephyr manifest revision. Please mention this explicitly (or split it) to keep the PR intent easy to track.

Copilot uses AI. Check for mistakes.
Comment on lines 330 to 334
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'

Copy link

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Python is bumped to 3.12 in this job (was 3.10). Please note this in the PR description/title or add a short rationale in the workflow comments so CI behavior changes are easier to correlate later.

Copilot uses AI. Check for mistakes.
Comment on lines 367 to 372
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
Copy link

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same Python 3.12 bump repeated for the cached setup-python step. If the PR description is updated, consider mentioning the Python runtime bump once rather than relying on readers noticing both workflow edits.

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Collaborator

@kv2019i kv2019i left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems we have multiple broken CI flows with SDK1.0 (fuzzer, ztest build), but I think these can be handled in follow-ups (or removed). The main SOF builds seem fine now. The sof-ci jenkins is something we will have to potentially drop.

@lgirdwood
Copy link
Copy Markdown
Member

@lrudyX fyi - we need to merge this and update our CI to use the new Zephyr SDK version.
@redzynix I guess you are already integrating the new SDK.

@dbaluta
Copy link
Copy Markdown
Collaborator

dbaluta commented Mar 27, 2026

@kv2019i can we merge this? All of our internal CI tests are broken without this.

Copy link
Copy Markdown
Contributor

@tmleman tmleman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing changes for fuzzing and UT

@tmleman
Copy link
Copy Markdown
Contributor

tmleman commented Mar 27, 2026

Missing changes for fuzzing and UT

diff --git a/.github/workflows/zephyr-unit-tests.yml b/.github/workflows/zephyr-unit-tests.yml
index 2db2e7d22..ed089a148 100644
--- a/.github/workflows/zephyr-unit-tests.yml
+++ b/.github/workflows/zephyr-unit-tests.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Build and run unit tests
         run: |
           cd workspace
-          export ZEPHYR_TOOLCHAIN_VARIANT=llvm
+          export ZEPHYR_TOOLCHAIN_VARIANT=host/llvm
           west twister --testsuite-root sof/test/ztest/unit/ --platform native_sim --verbose \
            --inline-logs
   # This part is commented out because it is not needed at the moment.
diff --git a/scripts/fuzz.sh b/scripts/fuzz.sh
index e29a0eed1..b8b69b5fd 100755
--- a/scripts/fuzz.sh
+++ b/scripts/fuzz.sh
@@ -189,7 +189,7 @@ setup()
     SOF_TOP=$(cd "$(dirname "$0")/.." && pwd)
     export SOF_TOP

-    export ZEPHYR_TOOLCHAIN_VARIANT=llvm
+    export ZEPHYR_TOOLCHAIN_VARIANT=host/llvm

     # Define ZEPHYR_BASE so this can be invoked even outside the west workspace.
     local WS_TOP

@tmleman
Copy link
Copy Markdown
Contributor

tmleman commented Mar 27, 2026

@kv2019i can we merge this? All of our internal CI tests are broken without this.

@dbaluta @kv2019i I just read the comments. If it's urgent for the change to go in this form, I won't block it and I can make the appropriate patch as a follow-up. But personally I'm not a fan of integrating changes that break bisection. It seems more correct to me for the west update to be in one commit along with the code changes it requires. In this case, it might even be necessary to split the west changes into several smaller steps.

@lgirdwood
Copy link
Copy Markdown
Member

lgirdwood commented Mar 27, 2026

@kv2019i can we merge this? All of our internal CI tests are broken without this.

@dbaluta @kv2019i I just read the comments. If it's urgent for the change to go in this form, I won't block it and I can make the appropriate patch as a follow-up. But personally I'm not a fan of integrating changes that break bisection. It seems more correct to me for the west update to be in one commit along with the code changes it requires. In this case, it might even be necessary to split the west changes into several smaller steps.

@redzynix are you able to add the above diff from @tmleman ?

Bump zephyr-lite version to v0.29.0 across workflows

Signed-off-by: Mateusz Redzynia <mateuszx.redzynia@intel.com>
Bump ubuntu runners to 24.04

Signed-off-by: Mateusz Redzynia <mateuszx.redzynia@intel.com>
@redzynix redzynix force-pushed the bump-zephyr-lite-version-to-v0.29.0 branch from 5119071 to 6df37cb Compare March 27, 2026 10:08
@redzynix
Copy link
Copy Markdown
Contributor Author

@kv2019i can we merge this? All of our internal CI tests are broken without this.

@dbaluta @kv2019i I just read the comments. If it's urgent for the change to go in this form, I won't block it and I can make the appropriate patch as a follow-up. But personally I'm not a fan of integrating changes that break bisection. It seems more correct to me for the west update to be in one commit along with the code changes it requires. In this case, it might even be necessary to split the west changes into several smaller steps.

@redzynix are you able to add the above diff from @tmleman ?

@tmleman @lgirdwood Done.

@kv2019i
Copy link
Copy Markdown
Collaborator

kv2019i commented Mar 27, 2026

@dbaluta I think we can fix fuzzer/UT later, we will be facing out "sof-ci/jenkins/pr-build" soon so that can be ignored (UPDATE: and these are already fixed, thanks @tmleman and @redzynix )

But not sure about "Internal Intel CI System/merge/codecheck". @tmleman @abonislawski @lgirdwood @lrudyX you need to ack if this can go forward with the fail or not.

@lgirdwood
Copy link
Copy Markdown
Member

ok, merging this now to unblock next steps that need to be performed.

@lgirdwood lgirdwood merged commit c3b8a95 into thesofproject:main Mar 27, 2026
46 of 48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants