Skip to content

Commit 06542af

Browse files
committed
infra: switch Travis build to make
1 parent a54ca06 commit 06542af

File tree

2 files changed

+30
-14
lines changed

2 files changed

+30
-14
lines changed

.travis.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
language: php
22

33
sudo: false
4-
54
php:
65
- 7.1
76
- 7.2
87

98
service:
9+
- docker
1010
- mongodb
1111

1212
matrix:
@@ -15,10 +15,9 @@ matrix:
1515
- php: 7.1
1616
env: SYMFONY_VERSION=3.0.*
1717
- php: 7.2
18-
env: SYMFONY_VERSION=4.0.* COVERAGE=true
19-
# test the latest release (including beta releases)
18+
env: SYMFONY_VERSION=4.0.*
2019
- php: 7.2
21-
env: DEPENDENCIES=beta
20+
env: SYMFONY_VERSION=4.0.* DEPENDENCIES=beta
2221

2322
cache:
2423
directories:
@@ -28,9 +27,9 @@ before_script:
2827
- phpenv config-rm xdebug.ini; echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini;
2928
- pecl install -f mongodb-stable;
3029
- composer self-update
31-
- composer config "platform.ext-mongo" "1.6.16" && composer require alcaeus/mongo-php-adapter;
32-
- if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;
33-
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
34-
- composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
30+
- make composer-compat
31+
- if [ "$DEPENDENCIES" = "beta" ]; then make composer-config-beta; fi;
32+
- make composer-install
3533

36-
phpunit: if [ "$COVERAGE" == true ]; then phpunit --coverage-text; else phpunit; fi
34+
script:
35+
- make ci

Makefile

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
QA_DOCKER_IMAGE=jakzal/phpqa:alpine
22
QA_DOCKER_COMMAND=docker run -it --rm -v "$(shell pwd):/project" -w /project ${QA_DOCKER_IMAGE}
33

4-
dist: cs-full phpstan
5-
ci: cs-full-check phpstan
4+
dist: cs-full phpstan phpunit
5+
ci: cs-full-check phpstan phpunit-coverage
66
lint: cs-full-check phpstan
77

88
phpstan:
9-
sh -c "${QA_DOCKER_COMMAND} phpstan analyse --configuration phpstan.neon --level 0 ."
9+
sh -c "${QA_DOCKER_COMMAND} phpstan analyse --configuration phpstan.neon --level 1 ."
1010

1111
cs:
1212
sh -c "${QA_DOCKER_COMMAND} php-cs-fixer fix -vvv --diff"
@@ -17,5 +17,22 @@ cs-full:
1717
cs-full-check:
1818
sh -c "${QA_DOCKER_COMMAND} php-cs-fixer fix -vvv --using-cache=false --diff --dry-run"
1919

20-
.PHONY: install install-dev install-lowest phpstan cs cs-full cs-full-checks docker-up down-down
21-
.PHONY: in-docker-install in-docker-install-dev in-docker-install-lowest in-docker-test in-docker-test-coverage
20+
composer-compat:
21+
composer config "platform.ext-mongo" "1.6.16"
22+
composer require alcaeus/mongo-php-adapter --no-update
23+
24+
composer-config-beta:
25+
composer config "minimum-stability" "beta"
26+
27+
composer-install:
28+
rm -f composer.lock && cp composer.json composer.json~
29+
composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update
30+
composer update --prefer-dist --no-interaction
31+
mv composer.json~ composer.json
32+
33+
phpunit:
34+
vendor/bin/phpunit
35+
36+
# TODO: output to COV
37+
phpunit-coverage:
38+
phpdbg -qrr vendor/bin/phpunit --coverage-text

0 commit comments

Comments
 (0)