You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/04/07 22:29:40 UTC
[08/50] [abbrv] lucene-solr:apiv2: LUCENE-7155: Script addVersion.py
does not detect the new naming convention for bugfix branches
LUCENE-7155: Script addVersion.py does not detect the new naming convention for bugfix branches
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6e446c0b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6e446c0b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6e446c0b
Branch: refs/heads/apiv2
Commit: 6e446c0b927f0c3953f38d5dedd40ed6851028c6
Parents: d08f327
Author: Jan Høydahl <ja...@apache.org>
Authored: Thu Mar 31 15:35:48 2016 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Thu Mar 31 15:35:48 2016 +0200
----------------------------------------------------------------------
dev-tools/scripts/scriptutil.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6e446c0b/dev-tools/scripts/scriptutil.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/scriptutil.py b/dev-tools/scripts/scriptutil.py
index 6a3bcab..10efd2b 100644
--- a/dev-tools/scripts/scriptutil.py
+++ b/dev-tools/scripts/scriptutil.py
@@ -107,9 +107,9 @@ def find_branch_type():
if branchName == b'master':
return 'master'
- if branchName.startswith(b'branch_'):
+ if re.match(r'branch_(\d+)x', branchName.decode('UTF-8')):
return 'stable'
- if branchName.startswith(b'lucene_solr_'):
+ if re.match(r'branch_(\d+)_(\d+)', branchName.decode('UTF-8')):
return 'release'
raise Exception('Cannot run bumpVersion.py on feature branch')