diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2014-08-11 13:58:20 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-08-11 13:58:20 +0400 |
| commit | 2ae0e7192aa1cb3218824ddc8cadbd6335b6dda3 (patch) | |
| tree | 9bdc14bd000cf707821a2d49fa4472e89f05139b /plugins | |
| parent | 7cb154d6fdf9ffc7b4f4dd824dada3828456dfb4 (diff) | |
Fix more YAML indentation issues and only throw exception for no tests in generate:travis-yml when generating for a plugin.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CoreConsole/TravisYmlView.php | 4 | ||||
| -rw-r--r-- | plugins/CoreConsole/templates/travis.yml.twig | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/plugins/CoreConsole/TravisYmlView.php b/plugins/CoreConsole/TravisYmlView.php index 8516c2aff8..c1d0438862 100644 --- a/plugins/CoreConsole/TravisYmlView.php +++ b/plugins/CoreConsole/TravisYmlView.php @@ -203,7 +203,9 @@ class TravisYmlView extends View 'env' => 'TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL'); } - if (empty($testsToRun)) { + if (!empty($this->pluginName) + && empty($testsToRun) + ) { throw new Exception("No tests to run for this plugin, aborting .travis.yml generation."); } diff --git a/plugins/CoreConsole/templates/travis.yml.twig b/plugins/CoreConsole/templates/travis.yml.twig index 58a920e704..86cd25f3e0 100644 --- a/plugins/CoreConsole/templates/travis.yml.twig +++ b/plugins/CoreConsole/templates/travis.yml.twig @@ -85,6 +85,8 @@ install: {% endif %} before_script: +{% if pluginName is not empty %} - cd piwik +{% endif %} - ./tests/travis/configure_git.sh # print out mysql information |