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:
authordiosmosis <benaka@piwik.pro>2015-07-15 23:50:14 +0300
committerdiosmosis <benaka@piwik.pro>2015-07-15 23:50:14 +0300
commit98657805af2e4b25b675c5c89541ea26e1cc9bac (patch)
treefced2eab7728ba6ad17d66b5b39b79bc1a0058f2 /plugins/TestRunner
parent8ef8455f60e6a02de84638743571956389dbc61c (diff)
Always add --verbose to self reference command in .travis.yml for autoupdate, and add check for first non-PR job to .travis.yml so plugin builds that use older Piwik versions won't fail when the .travis.yml is different.
Diffstat (limited to 'plugins/TestRunner')
-rw-r--r--plugins/TestRunner/TravisYml/Generator.php1
-rw-r--r--plugins/TestRunner/templates/travis.yml.twig2
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/TestRunner/TravisYml/Generator.php b/plugins/TestRunner/TravisYml/Generator.php
index 0c4e4b8579..eff56f1609 100644
--- a/plugins/TestRunner/TravisYml/Generator.php
+++ b/plugins/TestRunner/TravisYml/Generator.php
@@ -197,6 +197,7 @@ abstract class Generator
unset($options['github-token']);
unset($options['artifacts-pass']);
unset($options['dump']);
+ $options['verbose'] = true;
return $options;
}
diff --git a/plugins/TestRunner/templates/travis.yml.twig b/plugins/TestRunner/templates/travis.yml.twig
index edb9621084..caaf91b0ac 100644
--- a/plugins/TestRunner/templates/travis.yml.twig
+++ b/plugins/TestRunner/templates/travis.yml.twig
@@ -166,7 +166,7 @@ before_script:
- ./tests/travis/setup_webserver.sh
- export GENERATE_TRAVIS_YML_COMMAND="{{ consoleCommand|raw }}"
- - ./tests/travis/autoupdate_travis_yml.sh
+ - '[[ "$TRAVIS_JOB_NUMBER" != *.1 || "$TRAVIS_PULL_REQUEST" != "false" ]] || ./tests/travis/autoupdate_travis_yml.sh'
- cd {{ travisShCwd }}
{% if customTravisBuildSteps.before_script.after|default is not empty %}