Skip to content

ci(merge-coverage): add workflow to prove it works #5

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 64 additions & 0 deletions .github/workflows/merge-coverage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: "Merge Coverage"

on: [pull_request]

jobs:
unit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
tools: composer
coverage: xdebug
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: composer install
- run: vendor/bin/phpunit --testsuite unit --coverage-php reports/unit.php
- uses: actions/cache/save@v4
with:
path: reports
key: reports-unit-${{ github.run_id }}

integration:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
tools: composer
coverage: xdebug
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: composer install
- run: vendor/bin/phpunit --testsuite integration --coverage-php reports/integration.php
- uses: actions/cache/save@v4
with:
path: reports
key: reports-integration-${{ github.run_id }}

coverage:
runs-on: ubuntu-latest
needs: [integration, unit]

steps:
- uses: actions/checkout@v4
- uses: actions/cache/restore@v4
with:
path: reports
key: reports-unit-${{ github.run_id }}
- uses: actions/cache/restore@v4
with:
path: reports
key: reports-integration-${{ github.run_id }}

- uses: shivammathur/setup-php@v2
with:
tools: composer
coverage: xdebug
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: composer install
- run: php bin/merge-coverage.php


15 changes: 8 additions & 7 deletions .github/workflows/phpunit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Check out repository code
uses: actions/checkout@master

- uses: php-actions/composer@master

- name: PHPUnit Tests
uses: php-actions/phpunit@master
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
tools: composer
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: composer install
- run: vendor/bin/phpunit
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
### MacOs ###
.DS_Store

### PhpStorm ###
/.idea

### Composer ###
composer.lock
composer.phar
Expand All @@ -13,3 +16,4 @@ composer.phar
/reports
!/reports/.keep
/coverage

6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ test:
classnames.test:
docker compose exec php vendor/bin/phpunit --testsuite classnames

unit.test:
unit.test: start
docker compose exec php vendor/bin/phpunit --testsuite unit --coverage-php reports/unit.php

integration.test:
integration.test: start
docker compose exec php vendor/bin/phpunit --testsuite integration --coverage-php reports/integration.php

merge-coverage:
merge-coverage: unit.test integration.test
docker compose exec php bin/merge-coverage.php
9 changes: 4 additions & 5 deletions bin/merge-coverage.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@

require __DIR__.'/../vendor/autoload.php';

use \SebastianBergmann\CodeCoverage\CodeCoverage;
use \SebastianBergmann\CodeCoverage\Report\Html\CustomCssFile;
use \SebastianBergmann\CodeCoverage\Report\Html\Facade as HtmlReport;
use \PHPUnit\Runner\Version;

$reference = sprintf(' and <a href="https://phpunit.de/">PHPUnit %s</a>', Version::id());
$report = new HtmlReport($reference);

$unit = include('reports/unit.php');
$integration = include('reports/integration.php');

$unit->merge($integration);

$reference = sprintf(' and <a href="https://phpunit.de/">PHPUnit %s</a>', Version::id());

(new HtmlReport($reference))->process($unit, 'coverage');
$report->process($unit, 'coverage');



Expand Down