From 6bb4ebb054e1e014f14f4c925d506cab7a8b9e04 Mon Sep 17 00:00:00 2001 From: Benoit VIGNAL Date: Tue, 23 Dec 2025 10:39:48 +0100 Subject: [PATCH 1/3] feat: enable code coverage --- .github/workflows/continuous-integration.yml | 36 ++++++++++++++++++-- README.md | 3 ++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index aa04ed5..7a29b23 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -24,6 +24,10 @@ on: required: false type: string default: "" + code-coverage: + required: false + type: boolean + default: false jobs: ci: @@ -262,18 +266,46 @@ jobs: shell: "bash" run: | sudo service apache2 start + - name: "Setup coverage driver" + if: ${{ !cancelled() && inputs.code-coverage == true }} + shell: "bash" + run: | + if ! php -m | grep -q -E 'xdebug|pcov'; then + echo -e "\033[0;33mInstalling PCOV driver...\033[0m" + sudo pecl install pcov || true + fi + - name: "PHPUnit" if: ${{ !cancelled() && hashFiles(format('{0}/phpunit.xml', inputs.plugin-key)) != '' }} + env: + PCOV_ENABLED: "${{ inputs.code-coverage && '1' || '0' }}" + XDEBUG_MODE: "${{ inputs.code-coverage && 'coverage' || 'off' }}" run: | echo -e "\033[0;33mExecuting PHPUnit...\033[0m" + PHPUNIT_FLAGS="--colors=always" + PHP_CMD="php" + + if [[ "${{ inputs.code-coverage }}" == "true" ]]; then + PHPUNIT_FLAGS="$PHPUNIT_FLAGS --coverage-text --coverage-cobertura=cobertura.xml" + # Explicitly load PCOV if needed + PHP_CMD="php -d extension=pcov.so" + fi + if [[ -f "vendor/bin/phpunit" ]]; then - vendor/bin/phpunit --colors=always + $PHP_CMD vendor/bin/phpunit $PHPUNIT_FLAGS elif [[ -f "../../vendor/bin/phpunit" ]]; then - ../../vendor/bin/phpunit --colors=always + $PHP_CMD ../../vendor/bin/phpunit $PHPUNIT_FLAGS else echo -e "\033[0;31mPHPUnit binary not found!\033[0m" exit 1 fi + - name: "Upload coverage report" + uses: "actions/upload-artifact@v4" + if: ${{ !cancelled() && inputs.code-coverage == true }} + with: + name: "coverage-report" + path: "/var/www/glpi/plugins/${{ inputs.plugin-key }}/cobertura.xml" + overwrite: true - name: "Jest" if: ${{ !cancelled() && hashFiles(format('{0}/jest.config.js', inputs.plugin-key)) != '' }} run: | diff --git a/README.md b/README.md index af646d2..dfafab2 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,9 @@ jobs: # Optional extra services (possible values: "openldap"). extra-services: "openldap" + + # Whether to enable code coverage generation (default: false). + code-coverage: true ``` The available `glpi-version`/`php-version` combinations corresponds to the `ghcr.io/glpi-project/githubactions-glpi-apache` images tags From f6da82454bacd9d4cf462083e5558b3176564637 Mon Sep 17 00:00:00 2001 From: Benoit VIGNAL Date: Wed, 31 Dec 2025 11:07:19 +0100 Subject: [PATCH 2/3] chore: increase default version --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dfafab2..28dba87 100644 --- a/README.md +++ b/README.md @@ -36,10 +36,10 @@ jobs: plugin-key: "myplugin" # The version of GLPI on which to run the tests. - glpi-version: "10.0.x" + glpi-version: "11.0.x" # The version of PHP on which to run the tests. - php-version: "8.1" + php-version: "8.2" # The database docker image on which to run the tests. db-image: "mariadb:11.4" From 39189e40b647465e209b28a455fa6b20cc98232a Mon Sep 17 00:00:00 2001 From: Benoit VIGNAL Date: Thu, 19 Feb 2026 14:49:08 +0100 Subject: [PATCH 3/3] feat: Better coverage report with comparaison and config file --- .github/workflows/continuous-integration.yml | 49 ++++++--- .github/workflows/coverage-refresh.yml | 94 +++++++++++++++++ .github/workflows/coverage-report.yml | 103 +++++++++++++++++++ README.md | 78 +++++++++++++- 4 files changed, 309 insertions(+), 15 deletions(-) create mode 100644 .github/workflows/coverage-refresh.yml create mode 100644 .github/workflows/coverage-report.yml diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 7a29b23..91ce997 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -24,10 +24,6 @@ on: required: false type: string default: "" - code-coverage: - required: false - type: boolean - default: false jobs: ci: @@ -68,6 +64,26 @@ jobs: uses: "actions/checkout@v6" with: path: "${{ inputs.plugin-key }}" + - name: "Detect coverage configuration" + id: "coverage-config" + # Use default `bash` shell with `github-actions-runner` user + shell: "bash" + working-directory: "${{ github.workspace }}/${{ inputs.plugin-key }}" + run: | + CONFIG_FILE=".glpi-coverage.json" + if [[ -f "$CONFIG_FILE" ]]; then + ENABLED=$(jq -r '.enabled // true' "$CONFIG_FILE") + if [[ "$ENABLED" != "true" ]]; then + echo "coverage-enabled=false" >> $GITHUB_OUTPUT + echo "ℹ️ Code coverage is disabled via $CONFIG_FILE" + exit 0 + fi + echo "coverage-enabled=true" >> $GITHUB_OUTPUT + else + echo "coverage-enabled=false" >> $GITHUB_OUTPUT + echo "ℹ️ No $CONFIG_FILE found, code coverage is disabled." + exit 0 + fi - name: "Execute init script" if: ${{ inputs.init-script != '' }} # Use default `bash` shell with `github-actions-runner` user @@ -267,7 +283,7 @@ jobs: run: | sudo service apache2 start - name: "Setup coverage driver" - if: ${{ !cancelled() && inputs.code-coverage == true }} + if: ${{ !cancelled() && steps.coverage-config.outputs.coverage-enabled == 'true' }} shell: "bash" run: | if ! php -m | grep -q -E 'xdebug|pcov'; then @@ -278,15 +294,15 @@ jobs: - name: "PHPUnit" if: ${{ !cancelled() && hashFiles(format('{0}/phpunit.xml', inputs.plugin-key)) != '' }} env: - PCOV_ENABLED: "${{ inputs.code-coverage && '1' || '0' }}" - XDEBUG_MODE: "${{ inputs.code-coverage && 'coverage' || 'off' }}" + PCOV_ENABLED: "${{ steps.coverage-config.outputs.coverage-enabled == 'true' && '1' || '0' }}" + XDEBUG_MODE: "${{ steps.coverage-config.outputs.coverage-enabled == 'true' && 'coverage' || 'off' }}" run: | echo -e "\033[0;33mExecuting PHPUnit...\033[0m" PHPUNIT_FLAGS="--colors=always" PHP_CMD="php" - if [[ "${{ inputs.code-coverage }}" == "true" ]]; then - PHPUNIT_FLAGS="$PHPUNIT_FLAGS --coverage-text --coverage-cobertura=cobertura.xml" + if [[ "${{ steps.coverage-config.outputs.coverage-enabled }}" == "true" ]]; then + PHPUNIT_FLAGS="$PHPUNIT_FLAGS --coverage-text --coverage-cobertura=cobertura.xml --coverage-clover=clover.xml" # Explicitly load PCOV if needed PHP_CMD="php -d extension=pcov.so" fi @@ -299,12 +315,21 @@ jobs: echo -e "\033[0;31mPHPUnit binary not found!\033[0m" exit 1 fi + - name: "Fix coverage paths for IDE import" + if: ${{ !cancelled() && steps.coverage-config.outputs.coverage-enabled == 'true' }} + run: | + echo "Sanitizing paths in clover.xml..." + sed -i 's|/var/www/glpi/plugins/${{ inputs.plugin-key }}/|plugins/${{ inputs.plugin-key }}/|g' clover.xml - name: "Upload coverage report" - uses: "actions/upload-artifact@v4" - if: ${{ !cancelled() && inputs.code-coverage == true }} + uses: "actions/upload-artifact@v6" + if: ${{ !cancelled() && steps.coverage-config.outputs.coverage-enabled == 'true' }} with: name: "coverage-report" - path: "/var/www/glpi/plugins/${{ inputs.plugin-key }}/cobertura.xml" + path: | + /var/www/glpi/plugins/${{ inputs.plugin-key }}/cobertura.xml + /var/www/glpi/plugins/${{ inputs.plugin-key }}/clover.xml + /var/www/glpi/plugins/${{ inputs.plugin-key }}/.glpi-coverage.json + include-hidden-files: true overwrite: true - name: "Jest" if: ${{ !cancelled() && hashFiles(format('{0}/jest.config.js', inputs.plugin-key)) != '' }} diff --git a/.github/workflows/coverage-refresh.yml b/.github/workflows/coverage-refresh.yml new file mode 100644 index 0000000..6ee8e6c --- /dev/null +++ b/.github/workflows/coverage-refresh.yml @@ -0,0 +1,94 @@ +name: "Coverage refresh" + +on: + workflow_call: + inputs: + plugin-key: + required: true + type: string + workflow-name: + description: "Name of the CI workflow to trigger for coverage refresh. Must match the 'name' field in the plugin's CI workflow file." + required: false + type: string + default: "Continuous integration" + +jobs: + check-and-refresh: + name: "Check and refresh coverage artifact" + runs-on: "ubuntu-latest" + steps: + - name: "Checkout" + uses: "actions/checkout@v6" + with: + sparse-checkout: ".glpi-coverage.json" + + - name: "Check coverage configuration" + id: "coverage-config" + run: | + CONFIG_FILE=".glpi-coverage.json" + if [[ ! -f "$CONFIG_FILE" ]]; then + echo "ℹ️ No $CONFIG_FILE found, skipping coverage refresh." + echo "skip=true" >> $GITHUB_OUTPUT + exit 0 + fi + + ENABLED=$(jq -r '.enabled // true' "$CONFIG_FILE") + if [[ "$ENABLED" != "true" ]]; then + echo "ℹ️ Code coverage is disabled via $CONFIG_FILE, skipping refresh." + echo "skip=true" >> $GITHUB_OUTPUT + exit 0 + fi + + echo "skip=false" >> $GITHUB_OUTPUT + + - name: "Check artifact expiry" + if: steps.coverage-config.outputs.skip != 'true' + id: "check-expiry" + env: + GH_TOKEN: ${{ github.token }} + run: | + echo "Checking for existing coverage artifacts..." + + # The clearlyip action uses the naming pattern: coverage-{branch_name} + DEFAULT_BRANCH="${{ github.event.repository.default_branch }}" + ARTIFACT_NAME="coverage-${DEFAULT_BRANCH}" + + # List artifacts matching the coverage pattern + ARTIFACTS=$(gh api \ + "/repos/${{ github.repository }}/actions/artifacts?name=${ARTIFACT_NAME}&per_page=1" \ + --jq '.artifacts[0]' 2>/dev/null || echo "null") + + if [[ "$ARTIFACTS" == "null" || -z "$ARTIFACTS" ]]; then + echo "⚠️ No coverage artifact found. Refresh needed." + echo "needs-refresh=true" >> $GITHUB_OUTPUT + exit 0 + fi + + EXPIRES_AT=$(echo "$ARTIFACTS" | jq -r '.expires_at // empty') + if [[ -z "$EXPIRES_AT" ]]; then + echo "⚠️ Could not determine artifact expiry. Refresh needed." + echo "needs-refresh=true" >> $GITHUB_OUTPUT + exit 0 + fi + + EXPIRES_TS=$(date -d "$EXPIRES_AT" +%s) + TOMORROW_TS=$(date -d "+1 day" +%s) + + if [[ "$EXPIRES_TS" -le "$TOMORROW_TS" ]]; then + echo "⏰ Coverage artifact expires at $EXPIRES_AT (within 1 day). Refresh needed." + echo "needs-refresh=true" >> $GITHUB_OUTPUT + else + echo "✅ Coverage artifact is valid until $EXPIRES_AT. No refresh needed." + echo "needs-refresh=false" >> $GITHUB_OUTPUT + fi + + - name: "Trigger CI workflow" + if: steps.check-expiry.outputs.needs-refresh == 'true' + env: + GH_TOKEN: ${{ github.token }} + run: | + echo "🔄 Triggering CI workflow on default branch to refresh coverage artifact..." + gh workflow run "${{ inputs.workflow-name }}" \ + --repo "${{ github.repository }}" \ + --ref "${{ github.event.repository.default_branch }}" + echo "✅ Workflow dispatch triggered." diff --git a/.github/workflows/coverage-report.yml b/.github/workflows/coverage-report.yml new file mode 100644 index 0000000..005c51f --- /dev/null +++ b/.github/workflows/coverage-report.yml @@ -0,0 +1,103 @@ +name: "Coverage report" + +on: + workflow_call: + inputs: + plugin-key: + required: true + type: string + +permissions: + pull-requests: write + actions: read + +jobs: + coverage-report: + runs-on: "ubuntu-latest" + name: "Coverage report" + steps: + - name: "Download coverage report" + uses: "actions/download-artifact@v7" + with: + name: "coverage-report" + + - name: "Read coverage configuration" + id: "coverage-config" + run: | + CONFIG_FILE=".glpi-coverage.json" + if [[ ! -f "$CONFIG_FILE" ]]; then + echo "⚠️ No $CONFIG_FILE found, skipping coverage report." + echo "skip=true" >> $GITHUB_OUTPUT + exit 0 + fi + + ENABLED=$(jq -r '.enabled // true' "$CONFIG_FILE") + if [[ "$ENABLED" != "true" ]]; then + echo "ℹ️ Code coverage is disabled via $CONFIG_FILE" + echo "skip=true" >> $GITHUB_OUTPUT + exit 0 + fi + + echo "skip=false" >> $GITHUB_OUTPUT + echo "only-list-changed-files=$(jq -r '.only_list_changed_files // true' "$CONFIG_FILE")" >> $GITHUB_OUTPUT + echo "badge=$(jq -r '.badge // true' "$CONFIG_FILE")" >> $GITHUB_OUTPUT + echo "overall-coverage-fail-threshold=$(jq -r '.overall_coverage_fail_threshold // 0' "$CONFIG_FILE")" >> $GITHUB_OUTPUT + echo "file-coverage-error-min=$(jq -r '.file_coverage_error_min // 50' "$CONFIG_FILE")" >> $GITHUB_OUTPUT + echo "file-coverage-warning-max=$(jq -r '.file_coverage_warning_max // 75' "$CONFIG_FILE")" >> $GITHUB_OUTPUT + echo "fail-on-negative-difference=$(jq -r '.fail_on_negative_difference // false' "$CONFIG_FILE")" >> $GITHUB_OUTPUT + echo "retention-days=$(jq -r '.retention_days // 90' "$CONFIG_FILE")" >> $GITHUB_OUTPUT + + - name: "Generate coverage report" + if: steps.coverage-config.outputs.skip != 'true' + uses: "clearlyip/code-coverage-report-action@v6" + id: "coverage-report" + with: + filename: "cobertura.xml" + only_list_changed_files: ${{ steps.coverage-config.outputs.only-list-changed-files }} + badge: ${{ steps.coverage-config.outputs.badge }} + overall_coverage_fail_threshold: ${{ steps.coverage-config.outputs.overall-coverage-fail-threshold }} + file_coverage_error_min: ${{ steps.coverage-config.outputs.file-coverage-error-min }} + file_coverage_warning_max: ${{ steps.coverage-config.outputs.file-coverage-warning-max }} + fail_on_negative_difference: ${{ steps.coverage-config.outputs.fail-on-negative-difference }} + retention_days: ${{ steps.coverage-config.outputs.retention-days }} + artifact_download_workflow_names: "Continuous integration" + + - name: "Generating Markdown report" + if: github.event_name == 'pull_request' && steps.coverage-config.outputs.skip != 'true' && steps.coverage-report.outputs.file != '' + run: | + COVERAGE="${{ steps.coverage-report.outputs.coverage }}" + REPORT_FILE="code-coverage-results.md" + ARTIFACT_LINK="📥 [Download coverage-report artifact](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) _(contains \`cobertura.xml\` for IDE import + config file)_" + + # Split: keep header/badge visible, collapse the table inside
+ FIRST_TABLE_LINE=$(grep -n "^|" "$REPORT_FILE" | head -1 | cut -d: -f1) + + if [[ -z "$FIRST_TABLE_LINE" ]]; then + { + cat "$REPORT_FILE" + echo "" + echo "$ARTIFACT_LINK" + } > "${REPORT_FILE}.tmp" + else + { + head -n "$((FIRST_TABLE_LINE - 1))" "$REPORT_FILE" + echo "" + echo "
" + echo "📋 Details" + echo "" + tail -n "+${FIRST_TABLE_LINE}" "$REPORT_FILE" + echo "" + echo "$ARTIFACT_LINK" + echo "" + echo "
" + } > "${REPORT_FILE}.tmp" + fi + + mv "${REPORT_FILE}.tmp" "$REPORT_FILE" + + - name: "Add coverage PR comment" + if: github.event_name == 'pull_request' && steps.coverage-config.outputs.skip != 'true' && steps.coverage-report.outputs.file != '' + uses: "marocchino/sticky-pull-request-comment@v2" + with: + header: coverage + path: code-coverage-results.md diff --git a/README.md b/README.md index 28dba87..2447834 100644 --- a/README.md +++ b/README.md @@ -49,9 +49,6 @@ jobs: # Optional extra services (possible values: "openldap"). extra-services: "openldap" - - # Whether to enable code coverage generation (default: false). - code-coverage: true ``` The available `glpi-version`/`php-version` combinations corresponds to the `ghcr.io/glpi-project/githubactions-glpi-apache` images tags @@ -65,6 +62,75 @@ The `db-image` parameter is a combination of the DB server engine (`mysql`, `mar An optional `init-script` parameter can be used to define the path of an initialization script. This script will be executed with `bash`. It can be used, for instance, to install a specific PHP extension. +## Code coverage + +Code coverage is automatically enabled when a `.glpi-coverage.json` configuration file is present at the root of the plugin directory. + +If the file is not present, or if its `enabled` field is explicitly set to `false`, code coverage steps will be skipped entirely. + +### `.glpi-coverage.json` format + +All fields are optional. Default values are shown below: + +```json +{ + "enabled": true, + "only_list_changed_files": true, + "badge": true, + "overall_coverage_fail_threshold": 0, + "file_coverage_error_min": 50, + "file_coverage_warning_max": 75, + "fail_on_negative_difference": false, + "retention_days": 90 +} +``` + +| Field | Default | Description | +|-----------------------------------|---------|-----------------------------------------------------------------------------------------------------| +| `enabled` | `true` | Set to `false` to disable code coverage entirely. | +| `only_list_changed_files` | `true` | Only list files changed in the PR in the coverage report. | +| `badge` | `true` | Include a coverage badge in the report using shields.io. | +| `overall_coverage_fail_threshold` | `0` | Fail the workflow if overall coverage is below this percentage. | +| `file_coverage_error_min` | `50` | Files with coverage below this percentage are marked as error (red). | +| `file_coverage_warning_max` | `75` | Files with coverage below this percentage are marked as warning (orange). Above is success (green). | +| `fail_on_negative_difference` | `false` | Fail the workflow if any file coverage decreased compared to the base branch. | +| `retention_days` | `90` | Number of days to retain coverage artifacts for base branch comparison. | + +> **Tip:** To use as a reference without enabling coverage (e.g. for `glpi-empty`), create the file with `"enabled": false`. + +### IDE Integration + +The workflow produces a `coverage-report` artifact containing: +- `clover.xml`: Use this file to import coverage into PhpStorm or other IDEs. Paths are automatically sanitized to match `plugins//`. +- `cobertura.xml`: Used for the PR comment report. + +### Coverage report workflow + +The `coverage-report.yml` reusable workflow generates a PR comment with a coverage summary. It compares the coverage from the current PR against the base branch (using stored artifacts). + +```yaml + coverage-report: + needs: "ci" + uses: "glpi-project/plugin-ci-workflows/.github/workflows/coverage-report.yml@v1" + with: + plugin-key: "myplugin" +``` + +### Coverage refresh workflow + +The `coverage-refresh.yml` reusable workflow ensures that the base branch coverage artifact stays available for comparison. +It checks the artifact expiry date via the GitHub API and triggers the CI workflow on the default branch only if the artifact is missing or will expire within the next day. + +It should be triggered on `schedule` events (the daily cron in the CI workflow): + +```yaml + coverage-refresh: + if: github.event_name == 'schedule' + uses: "glpi-project/plugin-ci-workflows/.github/workflows/coverage-refresh.yml@v1" + with: + plugin-key: "myplugin" +``` + ## Generate CI matrix This workflow can be used to generate a matrix that contains the default PHP/SQL versions that are supported by the target GLPI version. @@ -110,4 +176,10 @@ jobs: glpi-version: "${{ matrix.glpi-version }}" php-version: "${{ matrix.php-version }}" db-image: "${{ matrix.db-image }}" + + coverage-report: + needs: "ci" + uses: "glpi-project/plugin-ci-workflows/.github/workflows/coverage-report.yml@v1" + with: + plugin-key: "myplugin" ```