[MediaWiki-commits] [Gerrit] Stop running composer twice - change (integration/config)

2015-07-29 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Stop running composer twice
..


Stop running composer twice

Since composer-merge-plugin v1.2.1 is used in core
eba9321b2b75823f8e9797398f44944e8a05389a the bug which we worked around with
this should not happen anymore.

Change-Id: Ic8b37c0fb8c5afbbe9b115f49b016141e779b356
---
M jjb/wikidata.yaml
1 file changed, 0 insertions(+), 2 deletions(-)

Approvals:
  Hashar: Looks good to me, but someone else must approve
  JanZerebecki: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 8ad0b49..3f3d8a9 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -6,8 +6,6 @@
 cd $WORKSPACE/src/
 
/srv/deployment/integration/slave-scripts/bin/mw-create-composer-local.py 
../deps.txt composer.local.json
 timeout 300 composer update --prefer-source -vvv
-# FIXME BUG the first run just exits without error without 
finishing especially in a clean working copy
-timeout 300 composer update --prefer-source -vvv
 
 - builder:
 name: wd-wikibase-apply-settings

-- 
To view, visit https://gerrit.wikimedia.org/r/227631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8b37c0fb8c5afbbe9b115f49b016141e779b356
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Stop running composer twice - change (integration/config)

2015-07-28 Thread JanZerebecki (Code Review)
JanZerebecki has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/227631

Change subject: Stop running composer twice
..

Stop running composer twice

Since composer-merge-plugin v1.2.1 is used in core
eba9321b2b75823f8e9797398f44944e8a05389a the bug which we worked around with
this should not happen anymore.

Change-Id: Ic8b37c0fb8c5afbbe9b115f49b016141e779b356
---
M jjb/wikidata.yaml
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/31/227631/1

diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 8ad0b49..3f3d8a9 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -6,8 +6,6 @@
 cd $WORKSPACE/src/
 
/srv/deployment/integration/slave-scripts/bin/mw-create-composer-local.py 
../deps.txt composer.local.json
 timeout 300 composer update --prefer-source -vvv
-# FIXME BUG the first run just exits without error without 
finishing especially in a clean working copy
-timeout 300 composer update --prefer-source -vvv
 
 - builder:
 name: wd-wikibase-apply-settings

-- 
To view, visit https://gerrit.wikimedia.org/r/227631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8b37c0fb8c5afbbe9b115f49b016141e779b356
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits