You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2016/04/12 12:45:25 UTC
[2/3] lucene-solr:branch_5x: LUCENE-7155: Script addVersion.py does
not detect the new naming convention for bugfix branches (cherry picked from
commit 6e446c0)
LUCENE-7155: Script addVersion.py does not detect the new naming convention for bugfix branches
(cherry picked from commit 6e446c0)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4c571903
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4c571903
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4c571903
Branch: refs/heads/branch_5x
Commit: 4c571903498ea505c14aed3278c22ede360e9d70
Parents: c19b1b9
Author: Jan Høydahl <ja...@apache.org>
Authored: Thu Mar 31 15:35:48 2016 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Tue Apr 12 12:43:00 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/4c571903/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')