From b3ddd5fa44a5dcc2668b8b243d6caaa3d63eab05 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 9 Apr 2024 11:16:22 +0200 Subject: [PATCH 1/2] php: Remove phpstan and upgrade actions/checkout --- .github/workflows/php.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index d17da2f9..88766088 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -22,7 +22,7 @@ jobs: steps: - name: Checkout code base - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -31,14 +31,7 @@ jobs: tools: phpcs - name: Setup dependencies - run: | - composer require -n --no-progress overtrue/phplint phpstan/phpstan - sudo git clone --depth 1 https://github.com/Icinga/icingaweb2.git /icingaweb2 - sudo git clone --depth 1 -b snapshot/nightly https://github.com/Icinga/icinga-php-library.git /usr/share/icinga-php/ipl - sudo git clone --depth 1 -b snapshot/nightly https://github.com/Icinga/icinga-php-thirdparty.git /usr/share/icinga-php/vendor - sudo git clone --depth 1 https://github.com/Icinga/icingaweb2-module-reporting.git /usr/share/icingaweb2-modules/reporting - sudo git clone --depth 1 https://github.com/Icinga/icingaweb2-module-pdfexport.git /usr/share/icingaweb2-modules/pdfexport - sudo git clone --depth 1 https://github.com/Icinga/icingaweb2-module-x509.git /usr/share/icingaweb2-modules/x509 + run: composer require -n --no-progress overtrue/phplint - name: PHP Lint if: ${{ ! cancelled() }} @@ -48,10 +41,6 @@ jobs: if: ${{ ! cancelled() }} run: phpcs -wps --colors - - name: PHPStan - if: ${{ ! cancelled() }} - run: ./vendor/bin/phpstan analyse - test: name: Unit tests with php ${{ matrix.php }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -67,7 +56,7 @@ jobs: steps: - name: Checkout code base - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 From 57b80ab22dc683dda01c71ddfdad8db96e7b8391 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 9 Apr 2024 11:16:44 +0200 Subject: [PATCH 2/2] phpstan: Add separate workflow --- .github/workflows/phpstan.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/phpstan.yml diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml new file mode 100644 index 00000000..4cac177a --- /dev/null +++ b/.github/workflows/phpstan.yml @@ -0,0 +1,19 @@ +name: PHPStan + +on: + pull_request: + branches: + - main + +jobs: + phpstan: + uses: icinga/github-actions/.github/workflows/phpstan.yml@main + with: + phpExtensions: ldap + dependencies: | + { + "/icingaweb2" : "https://github.com/Icinga/icingaweb2.git", + "/usr/share/icingaweb2-modules/x509" : "https://github.com/Icinga/icingaweb2-module-x509.git", + "/usr/share/icingaweb2-modules/pdfexport" : "https://github.com/Icinga/icingaweb2-module-pdfexport.git", + "/usr/share/icingaweb2-modules/reporting" : "https://github.com/Icinga/icingaweb2-module-reporting.git" + }