Fix non-incremented release when using test builds#791
Open
glehmann wants to merge 1 commit into
Open
Conversation
ydirson
requested changes
Mar 12, 2026
ydirson
left a comment
ydirson
left a comment
Contributor
There was a problem hiding this comment.
It's not that the format has changed, but xcp-ng-release needs to be built for that logic to trigger, so there are 2 packages that do not obey this logic (release, and its build-dependency branding-xcp-ng). Commit message should be adjusted.
Comment on lines
+152
to
+154
| base_nvr_re = ( | ||
| re.escape(re.sub('%{.+}', "@@@", base_nvr)).replace('@@@', '.*') | ||
| + r'(\d+)' | ||
| + re.escape(f'.xcpng{xcpng_version(target)}') | ||
| + r'(\d+)(' + re.escape(f'.xcpng{xcpng_version(target)}') + '| )' |
Contributor
There was a problem hiding this comment.
that expression starts to be quite complex to read, it would be useful to insert some comments to guide the reader
Member
Author
There was a problem hiding this comment.
I've simplified the regex and updated the comment
Some packages don't include the .xcpng8.3 at the end. This is adjusting the regex used to match with or without that suffix. Signed-off-by: Gaëtan Lehmann <gaetan.lehmann@vates.tech>
glehmann
force-pushed
the
gln/fix-koji-release-number-pyvm
branch
from
b413a46 to
7d780fe
Compare
Member
|
Ping @ydirson, review overdue on this one. |
ydirson
approved these changes
Jul 2, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The koji format seems to have changed and don't include the .xcpng8.3 at the end anymore.
The fix is still compabtible with the previous format, in case it depends on the client version, so it should continue to work for all the devs.