diff options
| author | brantje <brantje@gmail.com> | 2017-01-05 01:15:02 +0300 |
|---|---|---|
| committer | brantje <brantje@gmail.com> | 2017-01-05 01:15:02 +0300 |
| commit | a802e12c2c4daa4c95f60547bdcb1ef4b139aa1c (patch) | |
| tree | 95151dab5547c38aa0d8b7d2c149b181204ab7fb | |
| parent | f18e4f60e9d8a652d8506f1e23dea54cf2e28d93 (diff) | |
| parent | ed539284be7558dc983f078651a08682a2c4d345 (diff) | |
Merge branch 'optimizeTravis'
| -rw-r--r-- | .travis.yml | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index 7d45ac23..e6f06c97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,8 +48,8 @@ before_script: - cd apps/$APP_NAME/ - mkdir -p build - curl -sSL https://phar.phpunit.de/phpunit.phar -o build/phpunit.phar - - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then composer require codacy/coverage; fi" - - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi" + - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then composer require codacy/coverage; fi" + - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi" - sh -c "if [ '$JSTESTS' = '1' ]; then npm install; fi" # - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database $DB --database-pass='' @@ -59,15 +59,15 @@ script: - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then find . -name \*.php -exec php -l \"{}\" \;; fi" - cd ../../ - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then ./occ app:check-code $APP_NAME -c private -c strong-comparison; fi" - - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '2' ]; then ./occ app:check-code $APP_NAME -c deprecation; fi" + - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then ./occ app:check-code $APP_NAME -c deprecation; fi" - cd apps/$APP_NAME/ - - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then php build/phpunit.phar -v -c phpunit.xml --coverage-clover=coverage.clover --coverage-php=phpunit; fi" + - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then php build/phpunit.phar -v -c phpunit.xml --coverage-clover=coverage.clover --coverage-php=phpunit; fi" # Create coverage report - - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then php vendor/bin/codacycoverage -v clover coverage.clover; fi" - - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then php ocular.phar code-coverage:upload --access-token="$SCRUTINIZER_TOKEN" --format=php-clover coverage.clover; fi" + - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then php vendor/bin/codacycoverage -v clover coverage.clover; fi" + - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then php ocular.phar code-coverage:upload --access-token="$SCRUTINIZER_TOKEN" --format=php-clover coverage.clover; fi" - sh -c "if [ '$JSTESTS' = '1' ]; then grunt jshint; fi" @@ -92,22 +92,9 @@ matrix: env: DB=mysql;JSTESTS=1; - php: 7.0 env: DB=mysql;CODECHECK=1 - - php: 5.6 - env: DB=mysql;CODECHECK=2 - - php: 7.0 - env: DB=mysql;CODECHECK=2 - php: 7.0 env: DB=sqlite;CLOUD=owncloud;SERVER_FOLDER=core - php: 7.0 env: DB=mysql;CLOUD=owncloud;SERVER_FOLDER=core - - - php: 5.6 - env: DB=sqlite;CORE_BRANCH=stable11; - - php: 5.6 - env: DB=mysql;CORE_BRANCH=stable11; - - php: 7.0 - env: DB=sqlite;CORE_BRANCH=stable11; - - php: 7.0 - env: DB=mysql;CORE_BRANCH=stable11; allow_failures: - env: DB=sqlite;CODECHECK=2 |