You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2018/02/16 15:46:23 UTC
lucene-solr:master: LUCENE-8106: always fast-forward merge after
checkout
Repository: lucene-solr
Updated Branches:
refs/heads/master 26a037636 -> e71286c82
LUCENE-8106: always fast-forward merge after checkout
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e71286c8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e71286c8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e71286c8
Branch: refs/heads/master
Commit: e71286c8263646efe465ac7230a2f0000d7b34f9
Parents: 26a0376
Author: Steve Rowe <sa...@apache.org>
Authored: Fri Feb 16 10:45:46 2018 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Feb 16 10:45:46 2018 -0500
----------------------------------------------------------------------
dev-tools/scripts/reproduceJenkinsFailures.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e71286c8/dev-tools/scripts/reproduceJenkinsFailures.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/reproduceJenkinsFailures.py b/dev-tools/scripts/reproduceJenkinsFailures.py
index aa11ff3..fa561ec 100644
--- a/dev-tools/scripts/reproduceJenkinsFailures.py
+++ b/dev-tools/scripts/reproduceJenkinsFailures.py
@@ -38,6 +38,7 @@ reJavaFile = re.compile(r'(.*)\.java\Z')
reModule = re.compile(r'\./(.*)/src/')
reTestOutputFile = re.compile(r'TEST-(.*\.([^-.]+))(?:-\d+)?\.xml\Z')
reErrorFailure = re.compile(r'(?:errors|failures)="[^0]')
+reGitMainBranch = re.compile(r'^(?:master|branch_[x_\d]+)$')
# consoleText from Policeman Jenkins's Windows jobs fails to decode as UTF-8
encoding = 'iso-8859-1'
@@ -132,11 +133,8 @@ def prepareWorkspace(fetch, gitRef):
code = run(checkoutCmd)
if 0 != code:
raise RuntimeError('ERROR: "%s" failed. See above.' % checkoutCmd)
- if fetch:
- code = run('git pull')
- if 0 != code:
- raise RuntimeError('ERROR: "git pull" failed. See above.')
gitCheckoutSucceeded = True
+ run('git merge --ff-only', rememberFailure=False) # Ignore failure on non-branch ref
code = run('ant clean')
if 0 != code:
raise RuntimeError('ERROR: "ant clean" failed. See above.')