diff options
| author | NARUSE, Yui <naruse@airemix.jp> | 2021-04-06 11:25:10 +0900 |
|---|---|---|
| committer | NARUSE, Yui <naruse@airemix.jp> | 2021-04-06 12:02:46 +0900 |
| commit | ff91b97c83c5e9aa67bc4032d70f0ed19b334f44 (patch) | |
| tree | af1ccfdecb05cae1005561c8b17bdc8a145134b7 /tool/merger.rb | |
| parent | 3e5b69141036bcedc07b488613f87c154e921d1b (diff) | |
| download | ruby-ff91b97c83c5e9aa67bc4032d70f0ed19b334f44.tar.gz | |
The guard is to alert patchlevel of X.Y.0
Diffstat (limited to 'tool/merger.rb')
| -rwxr-xr-x | tool/merger.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/merger.rb b/tool/merger.rb index bac3e1194a..d38f00b0fd 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -116,7 +116,7 @@ class << Merger v, pl = version if relname abort "patchlevel is not -1 but '#{pl}' for preview or rc" if pl != '-1' && /-(?:preview|rc)/ =~ relname - abort "patchlevel is not 0 but '#{pl}' for the first release" if pl != '0' && /-(?:preview|rc)/ !~ relname + abort "patchlevel is not 0 but '#{pl}' for the first release" if pl != '0' && relname.end_with?(".0") pl = relname[/-(.*)\z/, 1] curver = "#{v.join('.')}#{("-#{pl}" if pl)}" if relname != curver |