Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Napoli <matthieu@mnapoli.fr>2015-04-30 02:00:58 +0300
committerMatthieu Napoli <matthieu@mnapoli.fr>2015-04-30 02:00:58 +0300
commit5b32684c9eb2bc75142cbdb64a30c1c07ef9a35b (patch)
tree33c44aa0209e6a55927cfd3108a4e6d0796d539c
parentcd1e90ad60bfd68a6854e95fd3d8bd83484691ce (diff)
Trying to re-enable composer selfupdate to fix UI tests
-rw-r--r--.travis.yml2
-rw-r--r--plugins/TestRunner/templates/travis.yml.twig2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 295701765c..44ff560873 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -119,7 +119,7 @@ before_script:
# - mysql -e "SHOW GLOBAL VARIABLES;"
# travis now complains about this failing 9 times out of 10, so removing it. hopefully the random failures it prevented won't come back
- # - travis_retry composer self-update
+ - travis_retry composer self-update
- '[ "$SKIP_COMPOSER_INSTALL" != "1" ] && travis_retry composer install'
diff --git a/plugins/TestRunner/templates/travis.yml.twig b/plugins/TestRunner/templates/travis.yml.twig
index 3f8c221f5d..713ae779ed 100644
--- a/plugins/TestRunner/templates/travis.yml.twig
+++ b/plugins/TestRunner/templates/travis.yml.twig
@@ -147,7 +147,7 @@ before_script:
# - mysql -e "SHOW GLOBAL VARIABLES;"
# travis now complains about this failing 9 times out of 10, so removing it. hopefully the random failures it prevented won't come back
- # - travis_retry composer self-update
+ - travis_retry composer self-update
- '[ "$SKIP_COMPOSER_INSTALL" != "1" ] && travis_retry composer install'