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 <thomas.steur@googlemail.com>2014-10-17 01:51:00 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-10-17 01:51:00 +0400
commit7480d35f30b541425ecdeaeb77377554b31a1022 (patch)
treee7094750e2c1dcb4ceae5237f3060e01d0e66474 /.travis.yml
parenteb09b1bf23225d4ac5365ceaa92e9b00f3704f24 (diff)
refs #6413 execute js/angular tests earlier as they are quick to execute. Otherwise we have to wait forever for a result
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 a874da048e..aad174d28f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,9 @@ language: php
# We want to test against PHP 5.3.3/5.4/5.5
php:
- 5.4
+ - 5.3.3
- 5.6
- 5.5
- - 5.3.3
# - hhvm
# Separate different test suites
@@ -24,12 +24,12 @@ env:
- TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL
- TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
- TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
- # All tests after another
- - TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL
- - TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
# Javascript tests
- TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
- TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL
+ # All tests after another
+ - TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL
+ - TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
global:
- PIWIK_ROOT_DIR=$TRAVIS_BUILD_DIR
- secure: "AMhZmPZx4SUcuZRBzGHlQPxzM4D8FvFB3UThDa52gbi9KIBrwcumzV2VGi6B\n5fgjwtB4XTE1In7qhY2HMikPWBmWYYOQ5QcMPJsqqHt4iMmahx8WKzne6NOk\nNpqAuje/fulNGeP2LJZi0nrub3Fh4VwXaOvpNloKNQN/2JuqPtM="