Skip to content

scripts/cmake: Set SOF_MICRO to 99 on main branch #9874

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.

Sign up for GitHub

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

Open
SurajSonawane2415 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

scripts/cmake: Set SOF_MICRO to 99 on main branch #9874

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions scripts/cmake/version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,21 @@ string(JSON SOF_MICRO ERROR_VARIABLE micro_error
# Don't confuse "error not found" with "version not found"
if(NOT "${micro_error}" STREQUAL "NOTFOUND")
message(STATUS "versions.json: ${micro_error}, defaulting to 0")
# 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"
Copy link
Collaborator

@kv2019i kv2019i Mar 5, 2025

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?

execute_process(
COMMAND git rev-parse --abbrev-ref HEAD
WORKING_DIRECTORY ${SOF_ROOT_SOURCE_DIRECTORY}
OUTPUT_VARIABLE GIT_BRANCH
OUTPUT_STRIP_TRAILING_WHITESPACE
)

# Set SOF_MICRO to 99 only on the "main" branch
if("${GIT_BRANCH}" STREQUAL "main")
set(SOF_MICRO 99)
else()
# Keep this default SOF_MICRO the same as the one in xtensa-build-zephyr.py
set(SOF_MICRO 0)
endif()
endif()

string(SUBSTRING "${GIT_LOG_HASH}" 0 5 SOF_TAG)
Expand Down
Loading