diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-28 17:15:05 +0300 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-28 17:15:05 +0300 |
| commit | d3f4325b5f6816a287e631d8a31d2551b748e939 (patch) | |
| tree | 149cabb96fcf315c489948cf91b28bc0b42000e6 | |
| parent | 094406aa324cafbfef01c60c52d566d221bbbebb (diff) | |
| parent | 634429d78e06e57e1b4f644a86fd92b590f378a8 (diff) | |
Merge pull request #549 from owncloud/update-travis-yml
remove build.xml
| -rw-r--r-- | .travis.yml | 26 | ||||
| -rw-r--r-- | build.xml | 25 |
2 files changed, 14 insertions, 37 deletions
diff --git a/.travis.yml b/.travis.yml index 2c2584157..b3edc0ecb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ php: - 5.4 - 5.5 - 5.6 +#- hhvm env: global: @@ -15,20 +16,21 @@ branches: only: - master - stable7 + before_install: -- composer self-update -- composer install -- wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install.sh -- bash ./before_install.sh mail $CORE_BRANCH $DB -- cd ../core -- php occ app:enable mail + - composer self-update + - composer install + - wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install.sh + - bash ./before_install.sh mail $CORE_BRANCH $DB + - cd ../core + - php occ app:enable mail script: -- cd apps/mail -- sh -c "if [ '$DB' = 'sqlite' ]; then ant test; fi" -- cd tests -- phpunit --configuration phpunit.xml -- wget https://scrutinizer-ci.com/ocular.phar -- php ocular.phar code-coverage:upload --format=php-clover clover.xml + - cd apps/mail + - find . -name \*.php -not -path './vendor/*' -exec php -l "{}" \; + - cd tests + - phpunit --configuration phpunit.xml + - wget https://scrutinizer-ci.com/ocular.phar + - php ocular.phar code-coverage:upload --format=php-clover clover.xml matrix: include: - php: 5.4 diff --git a/build.xml b/build.xml deleted file mode 100644 index f70da43f8..000000000 --- a/build.xml +++ /dev/null @@ -1,25 +0,0 @@ -<project name="owncloud-mail" basedir="." default="test"> - - <property file="build.properties"/> - - <!-- test - Tests if the code syntax is correct and executes phpunit tests --> - <target name="test"> - <apply executable="php" failonerror="true"> - <arg value="-l" /> - <fileset dir="."> - <include name="**/*.php" /> - <exclude name="vendor/**/*" /> - </fileset> - </apply> - - <!--<exec executable="phpunit" failonerror="true">--> - <!--<arg value="-c" />--> - <!--<arg path="${build.src.dir}/app/"/>--> - <!--<arg value="- -log-junit" />--> - <!--<arg path="${report.dir}/phpunit.xml"/>--> - <!--<arg value="- -coverage-clover" />--> - <!--<arg path=" ${report.dir}/clover.xml"/>--> - <!--</exec>--> - </target> - -</project> |