Skip to content

Conversation

@kv2019i
Copy link
Collaborator

@kv2019i kv2019i commented Sep 30, 2025

Open mainline for development and set version to 2.14.99 as stable-v2.14 has branched out.

Open mainline for development and set version to 2.14.99 as stable-v2.14
has branched out.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Copilot AI review requested due to automatic review settings September 30, 2025 15:54
Copy link

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 version number to 2.14.99 to open the mainline branch for development after the stable-v2.14 branch was created.

  • Updated the MINOR version from "13" to "14" in versions.json

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@kv2019i
Copy link
Collaborator Author

kv2019i commented Sep 30, 2025

@lgirdwood there was no rc1 tagged in mainline, so the mainline builds have a bit funky version string (2.13-rc1 plus a commit id point to current main). I was thinking once this PR is merged, we can tag the merged commit id with "devel-2.14-99" or something similar that will then up in the version string that is put into FW binaries (built from SOF main).

@lgirdwood
Copy link
Member

@lgirdwood there was no rc1 tagged in mainline, so the mainline builds have a bit funky version string (2.13-rc1 plus a commit id point to current main). I was thinking once this PR is merged, we can tag the merged commit id with "devel-2.14-99" or something similar that will then up in the version string that is put into FW binaries (built from SOF main).

That was pending Soundose cherry-pick which can now be done either @singalsu or me tomorrow.

@kv2019i
Copy link
Collaborator Author

kv2019i commented Oct 1, 2025

@lgirdwood Ack. and we haven't always tagged rc1 in mainline, often it has been in the stable tree. But when rc1 is done in stable tree, we need some tag in mainline to fix the version string for mainline builds. This is a minor thing though (the commit id is in the version string anyways).

@lgirdwood lgirdwood merged commit 1117d0b into thesofproject:main Oct 3, 2025
34 of 45 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.

2 participants