mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Support new version scheme in forward-merge hook
Closes gh-21636
This commit is contained in:
parent
d08d076fd8
commit
d995149b21
@ -1 +0,0 @@
|
|||||||
../../git/hooks/forward-merge
|
|
@ -18,7 +18,7 @@ def find_forward_merge(message_file)
|
|||||||
return nil unless rev
|
return nil unless rev
|
||||||
message = File.read(message_file)
|
message = File.read(message_file)
|
||||||
message.each_line do |line|
|
message.each_line do |line|
|
||||||
match = /^(?:Fixes|Closes) gh-(\d+) in ([\d\.]+(?:(?:M|RC)\d)?)$/.match(line)
|
match = /^(?:Fixes|Closes) gh-(\d+) in (\d\.\d\.\d(?:(?:\.|-)(?:M|RC)\d)?)$/.match(line)
|
||||||
if match then
|
if match then
|
||||||
issue = match[1]
|
issue = match[1]
|
||||||
milestone = match[2]
|
milestone = match[2]
|
||||||
|
Loading…
Reference in New Issue
Block a user