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:
authorThomas Steur <tsteur@users.noreply.github.com>2015-11-23 03:29:29 +0300
committerThomas Steur <tsteur@users.noreply.github.com>2015-11-23 03:29:29 +0300
commitfd39a27af7cbbffc04873fb739dd6f6114f6b729 (patch)
tree9bc2b72978144dd15d26c3498bb9523dff5c430e /.travis.yml
parent0a5e905def6caf2bb32ee0138b4420fe6bf19a3f (diff)
fix 2 jobs are running the JavaScriptTests on travis but only one should
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 420cf43678..dae7ac9c57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -90,11 +90,11 @@ matrix:
env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
# Javascript tests need to run only on one PHP version
- php: 5.3.3
- env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1
+ env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
- php: hhvm
- env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1
+ env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
- php: 7
- env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1
+ env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
# AngularJS tests need to run only on one PHP version
- php: 5.3.3
env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1
@@ -193,4 +193,4 @@ notifications:
- "irc.freenode.org#piwik-dev"
template:
- "%{repository} (%{commit}) : %{message} %{foo} "
- - "Build details: %{build_url}" \ No newline at end of file
+ - "Build details: %{build_url}"