Skip to content

Commit 1cde517

Browse files
committed
Merge 3.2
2 parents 62263d0 + a96220c commit 1cde517

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.github/workflows/ci.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -265,32 +265,34 @@ jobs:
265265
- name: Run ${{ matrix.component }} tests
266266
working-directory: src/${{ matrix.component }}
267267
run: |
268-
composer update
269-
vendor/bin/simple-phpunit --log-junit "build/logs/phpunit/junit.xml" ${{ matrix.coverage && '--coverage-clover build/logs/phpunit/clover.xml' || '' }}
268+
composer update
269+
mkdir -p build/logs/phpunit
270+
vendor/bin/phpunit --log-junit "build/logs/phpunit/junit.xml" ${{ matrix.coverage && '--coverage-clover build/logs/phpunit/clover.xml' || '' }}
270271
- name: Upload test artifacts
271272
if: always()
272273
uses: actions/upload-artifact@v3
273274
with:
274-
name: "phpunit-logs-php${{ matrix.php }}-${{ matrix.component }}"
275-
path: build/logs/phpunit
275+
name: phpunit-logs-php${{ matrix.php }}
276+
path: src/${{ matrix.component }}/build/logs/phpunit
276277
continue-on-error: true
277278
- name: Upload coverage results to Codecov
278279
if: matrix.coverage
279280
uses: codecov/codecov-action@v3
280281
with:
281-
directory: build/logs/phpunit
282-
name: "phpunit-php${{ matrix.php }}-${{ matrix.component }}"
282+
directory: src/${{ matrix.component }}/build/logs/phpunit
283+
name: phpunit-php${{ matrix.php }}
283284
flags: phpunit
284285
fail_ci_if_error: true
285286
continue-on-error: true
286287
- name: Upload coverage results to Coveralls
287288
if: matrix.coverage
288289
env:
289290
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
291+
working-directory: src/${{ matrix.component }}
290292
run: |
291293
composer global require --prefer-dist --no-interaction --no-progress --ansi php-coveralls/php-coveralls
292294
export PATH="$PATH:$HOME/.composer/vendor/bin"
293-
php-coveralls --coverage_clover "build/logs/phpunit/clover.xml"
295+
php-coveralls --coverage_clover=build/logs/phpunit/clover.xml
294296
continue-on-error: true
295297

296298
behat:

src/Metadata/phpunit.xml.dist

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
</testsuite>
1919
</testsuites>
2020

21+
<listeners>
22+
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
23+
</listeners>
24+
2125
<coverage>
2226
<include>
2327
<directory>./</directory>

0 commit comments

Comments
 (0)