Browse Source

Try tweaking travis config to run coverage tests first.

ADmad 7 years ago
parent
commit
d5cf408de3
1 changed files with 28 additions and 18 deletions
  1. 28 18
      .travis.yml

+ 28 - 18
.travis.yml

@@ -1,20 +1,10 @@
 language: php
 
-php:
-  - 7.1
-  - 7.2
-  - 7.3
-
 dist: trusty
 
 env:
-  matrix:
-    - DB=mysql db_dsn='mysql://root@127.0.0.1/cakephp_test?init[]=SET sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"'
-    - DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'
-    - DB=sqlite db_dsn='sqlite:///:memory:'
   global:
-    - DEFAULT=1
-    - PHPCS=0
+    - CODECOVERAGE=0
 
 services:
   - memcached
@@ -33,6 +23,26 @@ cache:
 matrix:
   fast_finish: true
 
+  include:
+    - php: 7.1
+      env: CODECOVERAGE=1 DB=mysql db_dsn='mysql://root@127.0.0.1/cakephp_test?init[]=SET sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"'
+    - php: 7.1
+      env: CODECOVERAGE=1 DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'
+    - php: 7.1
+      env: CODECOVERAGE=1 DB=sqlite db_dsn='sqlite:///:memory:'
+    - php: 7.2
+      env: DB=mysql db_dsn='mysql://root@127.0.0.1/cakephp_test?init[]=SET sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"'
+    - php: 7.2
+      env: DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'
+    - php: 7.2
+      env: DB=sqlite db_dsn='sqlite:///:memory:'
+    - php: 7.3
+      env: DB=mysql db_dsn='mysql://root@127.0.0.1/cakephp_test?init[]=SET sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"'
+    - php: 7.3
+      env: DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'
+    - php: 7.3
+      env: DB=sqlite db_dsn='sqlite:///:memory:'
+
 before_install:
   - echo cakephp version && tail -1 VERSION.txt
   - phpenv config-rm xdebug.ini
@@ -46,12 +56,12 @@ before_install:
   - if [ $DB = 'pgsql' ]; then psql -c 'CREATE SCHEMA test3;' -U postgres -d cakephp_test; fi
 
   - |
-      if [[ ${TRAVIS_PHP_VERSION} != "7.3" ]]; then
+      if [[ $TRAVIS_PHP_VERSION != "7.3" ]]; then
         echo 'extension = memcached.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
       fi
-  - if [[ $PHPCS = 0 ]] ; then echo 'extension = redis.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
-  - if [[ $PHPCS = 0 ]] ; then echo 'extension = apcu.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
-  - if [[ $PHPCS = 0 ]] ; then echo 'apc.enable_cli = 1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
+  - echo 'extension = redis.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - echo 'extension = apcu.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - echo 'apc.enable_cli = 1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
   - sudo locale-gen da_DK
 
@@ -59,12 +69,12 @@ before_script:
   - composer install --prefer-dist --no-interaction
 
 script:
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION == 7.1 ]]; then CODECOVERAGE=1 phpdbg -qrr vendor/bin/phpunit --coverage-clover=clover.xml; fi
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.1 ]]; then vendor/bin/phpunit; fi
+  - if [[ $CODECOVERAGE == 1 ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=clover.xml; fi
+  - if [[ $CODECOVERAGE != 1 ]]; then vendor/bin/phpunit; fi
 
 after_success:
   - |
-      if [[ -f clover.xml ]]; then
+      if [[ $CODECOVERAGE == 1 ]]; then
         wget https://scrutinizer-ci.com/ocular.phar
         php ocular.phar code-coverage:upload --format=php-clover clover.xml
       fi