Skip to content
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

Jump to bottom

fix: semver supports asterisk in range indicator #1438

Merged
merged 1 commit into from
Oct 27, 2020
Merged

fix: semver supports asterisk in range indicator #1438

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
15 changes: 7 additions & 8 deletions engine/base.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,17 +1225,16 @@ are added.

[#--
Strip any leading "v" (note we handle leading = in semver_satisfies)
Convert any range indicators ("x" or "X") to 0
* not supported as substitute for x
Convert any range indicators ("x" or "X" or "*") to 0
--]

[#function semverClean version]
[#-- Handle the full format --]
[#local match = version?matches(r"^v?(0|[1-9][0-9]*|x|X)\.(0|[1-9][0-9]*|x|X)\.(0|[1-9][0-9]*|x|X)(\-([^+]+))?(\+(.*))?$") ]
[#if match]
[#local major = match?groups[1]?replace("x", "0", "i")?number ]
[#local minor = match?groups[2]?replace("x", "0", "i")?number ]
[#local patch = match?groups[3]?replace("x", "0", "i")?number ]
[#local major = match?groups[1]?replace("[x*]", "0", "ir")?number ]
[#local minor = match?groups[2]?replace("[x*]", "0", "ir")?number ]
[#local patch = match?groups[3]?replace("[x*]", "0", "ir")?number ]
[#local pre = match?groups[5] ]
[#local build = match?groups[7] ]

Expand Down Expand Up @@ -1264,8 +1263,8 @@ Convert any range indicators ("x" or "X") to 0
[#-- Handle major.minor --]
[#local match = version?matches(r"^v?(0|[1-9][0-9]*|x|X)\.(0|[1-9][0-9]*|x|X)$") ]
[#if match]
[#local major = match?groups[1]?replace("x", "0", "i")?number ]
[#local minor = match?groups[2]?replace("x", "0", "i")?number ]
[#local major = match?groups[1]?replace("[x*]", "0", "ir")?number ]
[#local minor = match?groups[2]?replace("[x*]", "0", "ir")?number ]
[#local patch = 0 ]
[#return
[
Expand All @@ -1282,7 +1281,7 @@ Convert any range indicators ("x" or "X") to 0
[#-- Handle major --]
[#local match = version?matches(r"^v?(0|[1-9][0-9]*|x|X)$") ]
[#if match]
[#local major = match?groups[1]?replace("x", "0", "i")?number ]
[#local major = match?groups[1]?replace("[x*]", "0", "ir")?number ]
[#local minor = 0 ]
[#local patch = 0 ]
[#return
Expand Down