You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2018/03/21 15:51:55 UTC
lucene-solr:branch_7_3: Allow ant 1.10 for build
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7_3 a1692f950 -> be1b7914b
Allow ant 1.10 for build
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/be1b7914
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/be1b7914
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/be1b7914
Branch: refs/heads/branch_7_3
Commit: be1b7914bd5c10a3211961a80c26404235f29058
Parents: a1692f9
Author: Alan Woodward <ro...@apache.org>
Authored: Wed Mar 21 15:51:21 2018 +0000
Committer: Alan Woodward <ro...@apache.org>
Committed: Wed Mar 21 15:51:21 2018 +0000
----------------------------------------------------------------------
dev-tools/scripts/buildAndPushRelease.py | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/be1b7914/dev-tools/scripts/buildAndPushRelease.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.py
index af3053b..3781eb4 100644
--- a/dev-tools/scripts/buildAndPushRelease.py
+++ b/dev-tools/scripts/buildAndPushRelease.py
@@ -286,9 +286,18 @@ def parse_config():
def check_cmdline_tools(): # Fail fast if there are cmdline tool problems
if os.system('git --version >/dev/null 2>/dev/null'):
raise RuntimeError('"git --version" returned a non-zero exit code.')
+ check_ant()
+
+def check_ant(): # allow 1.8, 1.9, 1.10
antVersion = os.popen('ant -version').read().strip()
- if not antVersion.startswith('Apache Ant(TM) version 1.8') and not antVersion.startswith('Apache Ant(TM) version 1.9'):
- raise RuntimeError('ant version is not 1.8.X: "%s"' % antVersion)
+ if antVersion.startswith('Apache Ant(TM) version 1.8'):
+ return
+ if antVersion.startswith('Apache Ant(TM) version 1.9'):
+ return
+ if antVersion.startswith('Apache Ant(TM) version 1.10'):
+ return
+ raise RuntimeError('Unsupported ant version (expecting 1.8 - 1.10) :' + antVersion)
+
def main():
check_cmdline_tools()