From 0dff0fc1355f12115a0ce501dbce275b1826a477 Mon Sep 17 00:00:00 2001 From: Sukhwinder Dhillon Date: Mon, 15 Dec 2025 10:34:25 +0100 Subject: [PATCH 1/3] GitHub Actions: Use new PHP workflows - Remove obsolete workflow trigger for `release/*` branch pushes - Run workflow on push to branch `support/*` --- .github/workflows/php.yml | 39 +++++++---------------------------- .github/workflows/phpstan.yml | 13 ------------ 2 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 .github/workflows/phpstan.yml diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 039c9fa..b630ae4 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -1,40 +1,15 @@ -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', '8.4'] - 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 diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml deleted file mode 100644 index 52f91f0..0000000 --- a/.github/workflows/phpstan.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: PHPStan - -on: - pull_request: - -jobs: - phpstan: - uses: icinga/github-actions/.github/workflows/phpstan.yml@main - with: - dependencies: | - { - "/icingaweb2" : "https://github.com/Icinga/icingaweb2.git" - } From e7ab94f95ded3135108472ab8faa9847f1fe2216 Mon Sep 17 00:00:00 2001 From: Sukhwinder Dhillon Date: Mon, 15 Dec 2025 10:35:53 +0100 Subject: [PATCH 2/3] Remove `phpcs.xml` Use default from new workflow. --- .phpcs.xml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .phpcs.xml diff --git a/.phpcs.xml b/.phpcs.xml deleted file mode 100644 index 2aec461..0000000 --- a/.phpcs.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - Sniff our code a while - - ./ - - vendor/* - - - - - - - - - - - - - - - - - - - - From 9dc14aab8bb47ea253a088c89f6186994b0c59df Mon Sep 17 00:00:00 2001 From: Sukhwinder Dhillon Date: Mon, 15 Dec 2025 12:14:23 +0100 Subject: [PATCH 3/3] php: Run in any pull request Allow GitHub Actions workflow to run for every pull request instead of only main-based pull requests --- .github/workflows/php.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index b630ae4..29222dc 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -6,8 +6,6 @@ on: - main - support/* pull_request: - branches: - - main jobs: php: