Skip to content

Merge 2.4 into 2.5 #3178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 15, 2019
Merged

Merge 2.4 into 2.5 #3178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
18473eb
Don't run phpunit tests on Travis
teohhanhui Sep 6, 2019
b81ca8d
Install Symfony Flex and whitelist supported Symfony package versions
teohhanhui Oct 14, 2019
b959c6a
Move phpunit tests for postgres and mysql to CI workflow on GitHub Ac…
teohhanhui Oct 14, 2019
10bb648
Move phpunit tests for mongodb and elasticsearch to CI workflow on Gi…
teohhanhui Oct 14, 2019
1607fc7
Merge pull request #3054 from teohhanhui/make-ci-fast-again
teohhanhui Oct 15, 2019
5302c08
Merge branch '2.4' into merge-2.4
teohhanhui Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ commands:
command: |
sudo pecl install pcov-1.0.6
sudo docker-php-ext-enable pcov
install-symfony-flex:
steps:
- run:
name: Install Symfony Flex
command: |
composer global require --prefer-dist --no-progress --no-suggest --ansi \
symfony/flex
merge-code-coverage-reports:
parameters:
dir:
Expand Down Expand Up @@ -117,11 +124,11 @@ commands:
steps:
- save_cache:
paths:
- ~/.composer/cache
- ~/.composer/cache/files
key: composer-cache-{{ .Branch }}-{{ .BuildNum }}
- save_cache:
paths:
- ~/.composer/cache
- ~/.composer/cache/files
key: composer-cache-{{ .Revision }}-{{ .BuildNum }}
save-npm-cache:
steps:
Expand Down Expand Up @@ -201,27 +208,33 @@ executors:
php:
docker:
- image: circleci/php:7.3-node
environment:
SYMFONY_REQUIRE: ^3.4 || ^4.0
php-and-elasticsearch:
docker:
- image: circleci/php:7.3-node
# https://github.com/elastic/elasticsearch-docker/issues/84
- image: docker.elastic.co/elasticsearch/elasticsearch:6.7.2
environment:
SYMFONY_REQUIRE: ^3.4 || ^4.0
- image: docker.elastic.co/elasticsearch/elasticsearch:6.8.3 # https://github.com/elastic/elasticsearch/issues/43627
php-and-mongodb:
docker:
- image: circleci/php:7.3-node
environment:
SYMFONY_REQUIRE: ^3.4 || ^4.0
- image: circleci/mongo:4

jobs:
php-cs-fixer:
executor: php
environment:
PHP_CS_FIXER_FUTURE_MODE: 1
PHP_CS_FIXER_FUTURE_MODE: '1'
working_directory: ~/api-platform/core
steps:
- checkout
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- run:
name: Install PHP-CS-Fixer
command: |
Expand All @@ -239,15 +252,15 @@ jobs:
phpstan:
executor: php
environment:
# https://github.com/phpstan/phpstan-symfony/issues/37
APP_DEBUG: 1
APP_DEBUG: '1' # https://github.com/phpstan/phpstan-symfony/issues/37
working_directory: ~/api-platform/core
steps:
- checkout
- install-mongodb-php-extension
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- update-project-dependencies
- save-composer-cache
- clear-test-app-cache
Expand All @@ -268,6 +281,7 @@ jobs:
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- update-project-dependencies
- save-composer-cache
- clear-test-app-cache
Expand Down Expand Up @@ -315,6 +329,7 @@ jobs:
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- update-project-dependencies
- save-composer-cache
- clear-test-app-cache
Expand Down Expand Up @@ -360,6 +375,7 @@ jobs:
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- update-project-dependencies
- save-composer-cache
- clear-test-app-cache
Expand Down Expand Up @@ -397,6 +413,7 @@ jobs:
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- update-project-dependencies
- save-composer-cache
- clear-test-app-cache
Expand Down Expand Up @@ -440,6 +457,7 @@ jobs:
- disable-xdebug-php-extension
- disable-php-memory-limit
- restore-composer-cache
- install-symfony-flex
- update-project-dependencies
- save-composer-cache
- clear-test-app-cache
Expand Down
Loading