Merge branch 'travisFix'

This commit is contained in:
brantje 2017-02-05 17:05:39 +01:00
commit 7f1791a10f
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F

View file

@ -47,27 +47,27 @@ before_script:
- php -S localhost:8080 & - php -S localhost:8080 &
- cd apps/$APP_NAME/ - cd apps/$APP_NAME/
- mkdir -p build - mkdir -p build
- curl -sSL https://phar.phpunit.de/phpunit.phar -o build/phpunit.phar - curl -sSL https://phar.phpunit.de/phpunit-5.7.phar -o build/phpunit.phar
- sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then composer require codacy/coverage; fi" - sh -c "if [ '$JSTESTS' != '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 wget https://scrutinizer-ci.com/ocular.phar; fi"
- sh -c "if [ '$JSTESTS' = '1' ]; then npm install; 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='' # - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database $DB --database-pass=''
script: script:
# Test the app # Test the app
- sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then find . -name \*.php -exec php -l \"{}\" \;; fi" - sh -c "if [ '$JSTESTS' != '1' ]; then find . -name \*.php -exec php -l \"{}\" \;; fi"
- cd ../../ - 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' ]; then ./occ app:check-code $APP_NAME -c private -c strong-comparison; fi"
- sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then ./occ app:check-code $APP_NAME -c deprecation; fi" - sh -c "if [ '$JSTESTS' != '1' ]; then ./occ app:check-code $APP_NAME -c deprecation; fi"
- cd apps/$APP_NAME/ - cd apps/$APP_NAME/
- 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" - sh -c "if [ '$JSTESTS' != '1' ]; then php build/phpunit.phar -v -c phpunit.xml --coverage-clover=coverage.clover --coverage-php=phpunit; fi"
# Create coverage report # Create coverage report
- sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then php vendor/bin/codacycoverage -v clover coverage.clover; fi" - sh -c "if [ '$JSTESTS' != '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 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" - sh -c "if [ '$JSTESTS' = '1' ]; then grunt jshint; fi"
@ -87,11 +87,11 @@ matrix:
- php: 5.6 - php: 5.6
env: DB=mysql;CLOUD=owncloud;SERVER_FOLDER=core env: DB=mysql;CLOUD=owncloud;SERVER_FOLDER=core
- php: 5.6 - php: 5.6
env: DB=mysql;CODECHECK=1; env: DB=mysql;
- php: 5.6 - php: 5.6
env: DB=mysql;JSTESTS=1; env: DB=mysql;JSTESTS=1;
- php: 7.0 - php: 7.0
env: DB=mysql;CODECHECK=1 env: DB=mysql;
- php: 7.0 - php: 7.0
env: DB=sqlite;CLOUD=owncloud;SERVER_FOLDER=core env: DB=sqlite;CLOUD=owncloud;SERVER_FOLDER=core
- php: 7.0 - php: 7.0