diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-16 06:15:05 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-16 06:15:05 +0400 |
| commit | 91caf846536dd56f08e7c499a98dcdb72dbe5815 (patch) | |
| tree | b101a373fd30164daaf6b6ce6dcaedb31fe1549e /.travis.yml | |
| parent | 2b385c6cf6c3cb9c1cc8312139399719746e5ea7 (diff) | |
refs #6413 reduce number of jobs in travis.
Not sure if this would work. We would basically only start a job for
1 x AngualarJS
1 x JavaScript
1 x All Tests with PHP 5.4 and MySQLi
3 x All tests with PDO (5.3.3, 5.5 and 5.6)
1 x Unit test with PHP 5.4 and PDO
1 x Integration test with PHP 5.4 and PDO
1 x System test with PHP 5.4 and PDO
= 9 jobs compared to about 18 before
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index 08c6764afb..93448cebb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,9 @@ env: - TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL - TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL - # Mysqli - - TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI - - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI - - TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI + # 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 @@ -56,6 +55,17 @@ matrix: - php: 5.4 env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Unit exclude: + # run all tests not on PHP 5.3.3 and run MySQLI tests only on 5.4 + - php: 5.4 + env: TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL + - php: 5.3.3 + env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI + - php: 5.5 + env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI + - php: 5.6 + env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI + - php: hhvm + env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI # Javascript tests need to run only on one PHP version - php: 5.4 env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL @@ -74,31 +84,31 @@ matrix: env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL - php: hhvm env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL - # Only run Mysqli tests on PHP 5.4 + # Run test suites separately only on PHP 5.4 with PDO - php: 5.3.3 - env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI + env: TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL - php: 5.3.3 - env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI + env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL - php: 5.3.3 - env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI + env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL - php: 5.5 - env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI + env: TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL - php: 5.5 - env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI + env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL - php: 5.5 - env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI + env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL - php: 5.6 - env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI + env: TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL - php: 5.6 - env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI + env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL - php: 5.6 - env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI + env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL - php: hhvm - env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI + env: TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL - php: hhvm - env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI + env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL - php: hhvm - env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI + env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL script: $PIWIK_ROOT_DIR/tests/travis/travis.sh |