From fd39a27af7cbbffc04873fb739dd6f6114f6b729 Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Mon, 23 Nov 2015 13:29:29 +1300 Subject: fix 2 jobs are running the JavaScriptTests on travis but only one should --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.travis.yml') 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}" -- cgit v1.2.3