mirror of
https://github.com/Icinga/icingaweb2-module-graphite.git
synced 2026-02-03 20:40:06 -05:00
GitHub Actions: Use new PHP workflow (#344)
This PR switches to the new PHP workflow, which combines linting, static analysis, and unit testing. `phpcs.xml` file has been removed because the new workflow provides a default config for it and the file did not contain any special configurations anyway. Code style corrections were made to comply with the latest PSR coding standards. In addition, allow GitHub Actions workflow to run for every pull request instead of only main-based pull requests.
This commit is contained in:
commit
e4ce6a009d
4 changed files with 11 additions and 66 deletions
44
.github/workflows/php.yml
vendored
44
.github/workflows/php.yml
vendored
|
|
@ -1,42 +1,18 @@
|
|||
name: PHP Tests
|
||||
name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- release/*
|
||||
- support/*
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
|
||||
jobs:
|
||||
lint:
|
||||
name: Static analysis for php ${{ matrix.php }} on ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
|
||||
os: ['ubuntu-latest']
|
||||
|
||||
steps:
|
||||
- name: Checkout code base
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup PHP
|
||||
uses: shivammathur/setup-php@v2
|
||||
with:
|
||||
php-version: ${{ matrix.php }}
|
||||
tools: phpcs
|
||||
|
||||
- name: Setup dependencies
|
||||
run: composer require -n --no-progress overtrue/phplint
|
||||
|
||||
- name: PHP Lint
|
||||
if: ${{ ! cancelled() }}
|
||||
run: ./vendor/bin/phplint -n --exclude={^vendor/.*} -- .
|
||||
|
||||
- name: PHP CodeSniffer
|
||||
if: ${{ ! cancelled() }}
|
||||
run: phpcs -wps --colors
|
||||
php:
|
||||
name: PHP
|
||||
uses: Icinga/github-actions/.github/workflows/php.yml@main
|
||||
with:
|
||||
dependencies: |
|
||||
{
|
||||
"./vendor/icingaweb2-modules/icingadb" : "https://github.com/Icinga/icingadb-web.git"
|
||||
}
|
||||
|
|
|
|||
16
.github/workflows/phpstan.yml
vendored
16
.github/workflows/phpstan.yml
vendored
|
|
@ -1,16 +0,0 @@
|
|||
name: PHPStan
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
|
||||
jobs:
|
||||
phpstan:
|
||||
uses: icinga/github-actions/.github/workflows/phpstan.yml@main
|
||||
with:
|
||||
dependencies: |
|
||||
{
|
||||
"/icingaweb2" : "https://github.com/Icinga/icingaweb2.git",
|
||||
"/usr/share/icingaweb2-modules/icingadb" : "https://github.com/Icinga/icingadb-web.git"
|
||||
}
|
||||
|
|
@ -90,7 +90,7 @@ class GraphImage extends AbstractWidget
|
|||
$allVars = [];
|
||||
|
||||
foreach ($template->getCurves() as $curveName => $curve) {
|
||||
if (!isset($metrics[$curveName])) {
|
||||
if (! isset($metrics[$curveName])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
|
|||
15
phpcs.xml
15
phpcs.xml
|
|
@ -1,15 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<ruleset name="PSR12">
|
||||
<!-- Test all PHP files except those in vendor/ -->
|
||||
<file>./</file>
|
||||
<arg name="extensions" value="php"/>
|
||||
<exclude-pattern>vendor/*</exclude-pattern>
|
||||
|
||||
<arg name="report-width" value="auto"/>
|
||||
<arg name="report-full"/>
|
||||
<arg name="report-gitblame"/>
|
||||
<arg name="report-summary"/>
|
||||
<arg name="encoding" value="UTF-8"/>
|
||||
|
||||
<rule ref="PSR12"/>
|
||||
</ruleset>
|
||||
Loading…
Reference in a new issue