version.cmake: switch SOF_MAJOR etc. to a new, static versions.json
#7532
Conversation
marc-hb
force-pushed
the
static-versions
branch
2 times, most recently
from
28d1e41 to
3ca9547
Compare
|
This is ready for review CMake 3.19 is required for the JSON parser. The first 3.19 version was released at the end of 2020: https://github.com/Kitware/CMake/releases/tag/v3.19.0 These all passed for the most part
EDIT: now just one suspend/resume failure in https://sof-ci.01.org/sofpr/PR7532/build6883/devicetest/index.html, everything else green. |
marc-hb
requested review from
aborisovich,
aiChaoSONG,
andyross,
dnikodem,
juimonen,
kv2019i,
lyakh,
paulstelian97 and
plbossart
As discussed in thesofproject#6952, relying on `git describe` for defining SOF_MAJOR and friends is very brittle and unreliable. Switch to a static versions.json file instead. Note the full `git describe --tags` output is _still_ present in the binary, this is useful and left unchanged. It's just not used any more to guess SOF_MAJOR, SOF_MINOR and SOF_MICRO. Use JSON because CMake and pretty much every other piece of software has a JSON parser out of the box. This aligns with linux/Makefile, Zephyr/VERSIONS and probably many others. - except we use JSON because we're in 2023 so we don't spend time having fun re-implementing parsers any more. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
marc-hb
requested review from
dbaluta,
lbetlej,
lgirdwood and
mmaka1
as code owners
paulstelian97
left a comment
paulstelian97
left a comment
There was a problem hiding this comment.
This is a great change. While it does create issues with redundant information between tags (which won't disappear) and the actual version, I believe we can take enough care to keep it in sync. So I'm more on the "yes this is good" side of the fence, approving.
kv2019i
left a comment
kv2019i
left a comment
There was a problem hiding this comment.
Thanks @marc-hb ! We need to add this to the release checklist for 2.6 once that is created. FYI @mengdonglin @lgirdwood
|
One fail in https://sof-ci.01.org/sofpr/PR7532/build6883/devicetest/index.html , not related, proceeding with merge. |
Submitted: Edited: |
4 participants
As discussed in #6952, relying on
git describefor defining SOF_MAJOR and friends is very brittle and unreliable. Switch to a staticversions.jsonfile instead.Note the full
git describe --tagsoutput is still present in the binary, this is useful and left unchanged. It's just not used any more to guess SOF_MAJOR, SOF_MINOR and SOF_MICRO.Use JSON because CMake and pretty much every other piece of software has a JSON parser out of the box.
This aligns with linux/Makefile, Zephyr/VERSIONS and probably many others. - except we use JSON because we're in 2023 so we don't spend time having fun re-implementing parsers any more.