[MediaWiki-commits] [Gerrit] Retry composer install on travis - change (mediawiki...Wikibase)

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

Change subject: Retry composer install on travis
..


Retry composer install on travis

This sometimes fails for no apparent reason, eg.
https://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase/jobs/69970751

Also removed no longer needed workaround.

Change-Id: Ie6152a1523f25b271a3e4b1e02682c03dd9a552a
---
M build/travis/install.sh
1 file changed, 10 insertions(+), 1 deletion(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/build/travis/install.sh b/build/travis/install.sh
index 495d345..6dbad81 100755
--- a/build/travis/install.sh
+++ b/build/travis/install.sh
@@ -21,7 +21,11 @@
 cd phase3
 composer self-update
 composer install
-composer dump-autoload -o # Workaround 
https://github.com/wikimedia/composer-merge-plugin/issues/41
+
+# Try composer install again... this tends to fail from time to time
+if [ $? -gt 0 ]; then
+   composer install
+fi
 
 mysql -e 'create database its_a_mw;'
 php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw 
--dbpath $(pwd) --pass nyan TravisWiki admin
@@ -38,3 +42,8 @@
 cd Wikibase
 
 composer install --prefer-source
+
+# Try composer install again... this tends to fail from time to time
+if [ $? -gt 0 ]; then
+   composer install --prefer-source
+fi

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6152a1523f25b271a3e4b1e02682c03dd9a552a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Retry composer install on travis - change (mediawiki...Wikibase)

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

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

Change subject: Retry composer install on travis
..

Retry composer install on travis

This sometimes fails for no apparent reason, eg.
https://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase/jobs/69970751

Change-Id: Ie6152a1523f25b271a3e4b1e02682c03dd9a552a
---
M build/travis/install.sh
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/59/223459/1

diff --git a/build/travis/install.sh b/build/travis/install.sh
index 495d345..6dbad81 100755
--- a/build/travis/install.sh
+++ b/build/travis/install.sh
@@ -21,7 +21,11 @@
 cd phase3
 composer self-update
 composer install
-composer dump-autoload -o # Workaround 
https://github.com/wikimedia/composer-merge-plugin/issues/41
+
+# Try composer install again... this tends to fail from time to time
+if [ $? -gt 0 ]; then
+   composer install
+fi
 
 mysql -e 'create database its_a_mw;'
 php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw 
--dbpath $(pwd) --pass nyan TravisWiki admin
@@ -38,3 +42,8 @@
 cd Wikibase
 
 composer install --prefer-source
+
+# Try composer install again... this tends to fail from time to time
+if [ $? -gt 0 ]; then
+   composer install --prefer-source
+fi

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6152a1523f25b271a3e4b1e02682c03dd9a552a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de

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