Merging update from framagit (creating gitlab-ci)

Conflicts:
	.gitlab-ci.yml
This commit is contained in:
Julien Fastré 2015-10-17 00:38:41 +02:00
parent df2755a84d
commit 6caf89383e

View File

@ -10,9 +10,11 @@ before_script:
- php Tests/Fixtures/App/console doctrine:migrations:migrate --env=test --no-interaction - php Tests/Fixtures/App/console doctrine:migrations:migrate --env=test --no-interaction
- php Tests/Fixtures/App/console doctrine:fixtures:load --env=test --no-interaction - php Tests/Fixtures/App/console doctrine:fixtures:load --env=test --no-interaction
test:php-5.6: test:php-5.6:
stage: test stage: test
script: phpunit --testdox script: phpunit --testdox
test:php-7: test:php-7:
stage: test stage: test
script: phpunit --testdox script: phpunit --testdox