Skip to content

Commit

Permalink
Add lint tests and remove travis
Browse files Browse the repository at this point in the history
  • Loading branch information
dpakach committed Nov 20, 2018
1 parent 6ce71fa commit bd67579
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 142 deletions.
13 changes: 13 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ pipeline:
- php occ a:l
- php occ a:e gallery
- php occ a:e testing
- php occ a:d firstrunwizard
- php occ a:l
- php occ config:system:set trusted_domains 1 --value=owncloud
- php occ log:manage --level 0
Expand Down Expand Up @@ -63,6 +64,15 @@ pipeline:
matrix:
TEST_SUITE: owncloud-coding-standard

php-lint-tests:
image: owncloudci/php:${PHP_VERSION}
pull: true
commands:
- make test-php-lint
when:
matrix:
TEST_SUITE: php-lint

phpunit-tests:
image: owncloudci/php:${PHP_VERSION}
pull: true
Expand Down Expand Up @@ -171,6 +181,9 @@ matrix:
- PHP_VERSION: 7.2
TEST_SUITE: owncloud-coding-standard

- PHP_VERSION: 7.2
TEST_SUITE: php-lint

# Unit Tests
- PHP_VERSION: 7.1
OC_VERSION: daily-master-qa
Expand Down
142 changes: 0 additions & 142 deletions .travis.yml

This file was deleted.

8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ test-php-unit-dbg: ## Run php unit tests with php dbg
test-php-unit-dbg: vendor/bin/phpunit
$(PHPUNITDBG) --configuration ./phpunit.xml --testsuite unit

.PHONY: test-php-lint
test-php-lint:
test-php-lint: vendor/bin/parallel-lint
php vendor/bin/parallel-lint --exclude vendor/composer/autoload_static.php --exclude travis --exclude vendor --exclude vendor-bin . vendor/composer vendor/symfony/yaml vendor/autoload.php

#
# Dependency management
#--------------------------------------
Expand All @@ -159,6 +164,9 @@ test-php-unit-dbg: vendor/bin/phpunit
vendor/bin/codecept: composer.lock
composer install

vendor/bin/parallel-lint: composer.lock
composer install

vendor/bamarni/composer-bin-plugin: composer.lock
composer install

Expand Down

0 comments on commit bd67579

Please sign in to comment.