Skip to content

Commit b18ffbc

Browse files
committed
Drop Docker from test suite
1 parent f766dd8 commit b18ffbc

File tree

7 files changed

+52
-281
lines changed

7 files changed

+52
-281
lines changed

.github/workflows/ci.yml

Lines changed: 52 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -30,32 +30,60 @@ jobs:
3030
- highest
3131
- lowest
3232

33+
driver:
34+
- "none"
35+
- "xdebug"
36+
- "pcov"
37+
3338
include:
3439
- php-version: "8.0"
3540
dependencies: "force_latest"
3641

3742
steps:
3843
- uses: actions/checkout@v2
3944

40-
- name: Init Docker
41-
run: docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml up -d
45+
- name: "Setup PHP"
46+
uses: "shivammathur/setup-php@v2"
47+
with:
48+
php-version: ${{ matrix.php-version }}
49+
coverage: ${{ matrix.driver }}
50+
tools: cs2pr, composer:v2
51+
env:
52+
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4253

4354
- name: Verify PHP version used
4455
run: |
45-
docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm php -v && php -m;
46-
docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm_xdebug php -v && php -m;
47-
docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm_pcov php -v && php -m;
56+
php -v && php -m;
57+
58+
- name: Setup problem matchers for PHP
59+
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
60+
61+
- name: Setup problem matchers for PHPUnit
62+
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
4863

4964
- name: Validate composer.json
50-
run: docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm composer validate
65+
run: composer validate --strict
66+
67+
- name: Get composer cache directory
68+
id: composercache
69+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
70+
71+
- name: Set up build cache
72+
uses: "actions/cache@v2"
73+
with:
74+
path: |
75+
${{ steps.composercache.outputs.dir }}
76+
"build/php-code-coverage-cache"
77+
key: "php-${{ matrix.php-version }}-deps-${{ matrix.dependencies }}-${{ hashFiles('composer.json') }}"
78+
restore-keys: "php-${{ matrix.php-version }}-deps-${{ matrix.dependencies }}"
5179

5280
- name: Force Symfony version
5381
if: matrix.symfony-version != ''
54-
run: docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm composer require --no-update "symfony/symfony:${{ matrix.symfony-version }}"
82+
run: composer require --no-update "symfony/symfony:${{ matrix.symfony-version }}"
5583

5684
- name: Force php-code-coverage version
5785
if: matrix.php-code-coverage-version != ''
58-
run: docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm composer require --no-update "phpunit/php-code-coverage:${{ matrix.php-code-coverage-version }}"
86+
run: composer require --no-update "phpunit/php-code-coverage:${{ matrix.php-code-coverage-version }}"
5987

6088
- name: Composer cache
6189
uses: "actions/cache@v2"
@@ -66,59 +94,42 @@ jobs:
6694

6795
- name: Remove PHP-CS-Fixer if not called
6896
if: matrix.php-version != '7.4' || matrix.symfony-version != '^5.0' || matrix.dependencies != 'highest'
69-
run: docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm composer remove --dev --no-update "friendsofphp/php-cs-fixer";
97+
run: composer remove --dev --no-update "friendsofphp/php-cs-fixer";
7098

7199
- name: Install dependencies (low)
72100
if: matrix.dependencies == 'lowest'
73-
run: docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm composer update --prefer-lowest --no-interaction --prefer-dist
101+
run: composer update --prefer-lowest --no-interaction --prefer-dist
74102

75103
- name: Install dependencies (high)
76104
if: matrix.dependencies == 'highest'
77-
run: docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm composer update --no-interaction --prefer-dist
105+
run: composer update --no-interaction --prefer-dist
78106

79107
- name: Install dependencies (force latest)
80108
if: matrix.dependencies == 'force_latest'
81109
run: |
82-
docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm composer config minimum-stability dev;
83-
docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm composer update --no-interaction --prefer-dist --ignore-platform-reqs;
110+
composer config minimum-stability dev;
111+
composer update --no-interaction --prefer-dist --ignore-platform-reqs;
84112
85113
- name: Check code style
86114
if: matrix.php-version == '7.4' && matrix.symfony-version == '^5.0' && matrix.dependencies == 'highest'
87-
run: docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --diff-format=udiff --allow-risky=yes
115+
run: vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --diff-format=udiff --allow-risky=yes
88116

89-
- name: PHPUnit (no coverage driver)
90-
run: docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm php vendor/phpunit/phpunit/phpunit;
91-
92-
- name: PHPUnit (Xdebug)
117+
- name: PHPUnit
93118
run: |
94-
docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm_xdebug php -dmemory_limit=-1 vendor/phpunit/phpunit/phpunit --coverage-clover=coverage-xdebug.xml --path-coverage;
95-
if [ "${{ matrix.php-version }}" = "7.4" ]; then
96-
wget https://scrutinizer-ci.com/ocular.phar;
97-
php ocular.phar code-coverage:upload --format=php-clover coverage-xdebug.xml;
98-
fi;
99-
100-
- name: PHPUnit (PCOV)
101-
run: docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm_pcov php vendor/phpunit/phpunit/phpunit --coverage-clover=coverage-pcov.xml;
102-
if [ "${{ matrix.php-version }}" = "7.4" ]; then
103-
wget https://scrutinizer-ci.com/ocular.phar;
104-
php ocular.phar code-coverage:upload --format=php-clover coverage-pcov.xml;
119+
if [ "${{ matrix.driver }}" == "xdebug" ]; then
120+
php -dmemory_limit=-1 vendor/phpunit/phpunit/phpunit --coverage-clover=coverage.xml --path-coverage;
121+
else
122+
php -dmemory_limit=-1 vendor/phpunit/phpunit/phpunit --coverage-clover=coverage.xml;
105123
fi;
106-
107-
- name: Behat (no coverage driver)
108-
run: docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm php vendor/behat/behat/bin/behat --strict;
109-
110-
- name: Behat (Xdebug)
111-
run: |
112-
docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm_xdebug php -dmemory_limit=-1 vendor/behat/behat/bin/behat --strict;
113-
if [ "${{ matrix.php-version }}" = "7.4" ]; then
124+
if [ "${{ matrix.php-version }}" = "7.4" ] && [ "${{ matrix.driver }}" != "none" ]; then
114125
wget https://scrutinizer-ci.com/ocular.phar;
115-
php ocular.phar code-coverage:upload --format=php-clover build/coverage-behat/clover.xml;
126+
php ocular.phar code-coverage:upload --format=php-clover coverage.xml;
116127
fi;
117128
118-
- name: Behat (PCOV)
129+
- name: Behat
119130
run: |
120-
docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm_pcov php vendor/behat/behat/bin/behat --strict;
121-
if [ "${{ matrix.php-version }}" = "7.4" ]; then
131+
php -dmemory_limit=-1 vendor/behat/behat/bin/behat --strict;
132+
if [ "${{ matrix.php-version }}" = "7.4" ] && [ "${{ matrix.driver }}" != "none" ]; then
122133
wget https://scrutinizer-ci.com/ocular.phar;
123134
php ocular.phar code-coverage:upload --format=php-clover build/coverage-behat/clover.xml;
124135
fi;

tests/docker/php7.3/Dockerfile

Lines changed: 0 additions & 41 deletions
This file was deleted.

tests/docker/php7.3/docker-compose.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

tests/docker/php7.4/Dockerfile

Lines changed: 0 additions & 41 deletions
This file was deleted.

tests/docker/php7.4/docker-compose.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

tests/docker/php8.0/Dockerfile

Lines changed: 0 additions & 53 deletions
This file was deleted.

tests/docker/php8.0/docker-compose.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)