-
Notifications
You must be signed in to change notification settings - Fork 327
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
scripts/cmake: Set SOF_MICRO to 99 on main branch #9874
base: main
Are you sure you want to change the base?
Conversation
Can one of the admins verify this patch?
|
test this please |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No objections from me, aligning with Zephyr makes sense.
This ensures SOF_MICRO is set to 99 when on the main branch, aligning with Zephyr's approach for never-released branches. For other branches, it remains 0 to maintain consistency with xtensa-build-zephyr.py. Signed-off-by: Suraj Sonawane <surajsonawane0215@gmail.com>
0d6b8de
to
456fe4b
Compare
Two checks previously failed due to:
I have amended the commit to include the commit description and |
Thank you for your review! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @SurajSonawane2415 for the pull request!
Some comment inline, I'm not sure how relevant the TODO entry is, please see my comment.
# TODO: default this to .99 on the main, never released branch like zephyr does | ||
# Keep this default SOF_MICRO the same as the one in xtensa-build-zephyr.py | ||
set(SOF_MICRO 0) | ||
# Detect if the current branch is "main" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, I think this TODO predates our move to have 99 set in versions.json in SOF main (just like Zephyr has a VERSION file and sets 99 as micro/patchlevel in Zephyr main). Not sure we need this check and whether it has any impact now...? Or am I missing something?
Set SOF_MICRO to 99 on the main branch
This change ensures that SOF_MICRO is set to 99 when on the main branch, similar to Zephyr’s approach for never-released branches. For other branches, it remains 0 to maintain consistency with xtensa-build-zephyr.py.
Fixes the TODO:
Changes:
Testing:
Verified SOF_MICRO = 99 on main, 0 on other branches by running:
I would appreciate your review and any suggestions for improvement. Thank you!