From 198f1e5c5d2c4c5bfd7cf3a819f28bc231f77826 Mon Sep 17 00:00:00 2001 From: IanDelMar Date: Thu, 10 Mar 2022 15:21:38 +0000 Subject: [PATCH 1/6] Update PHPMD basefile --- phpmd.baseline.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/phpmd.baseline.xml b/phpmd.baseline.xml index b36e043a..9a71ffa2 100644 --- a/phpmd.baseline.xml +++ b/phpmd.baseline.xml @@ -1,7 +1,6 @@ - From cde45d6570a5c8006b59299055844e66c3793481 Mon Sep 17 00:00:00 2001 From: IanDelMar <42134098+IanDelMar@users.noreply.github.com> Date: Fri, 11 Mar 2022 00:27:28 +0100 Subject: [PATCH 2/6] remove branch from workflow_dispatch --- .github/workflows/linting.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 247910b6..307ec6a4 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -6,7 +6,6 @@ on: pull_request: branches: [ develop ] workflow_dispatch: - branches: [ develop ] env: php-version: '7.4' From 76405f0f36783b2af48d343cc7ee0d30520e47d7 Mon Sep 17 00:00:00 2001 From: IanDelMar <42134098+IanDelMar@users.noreply.github.com> Date: Fri, 11 Mar 2022 00:28:35 +0100 Subject: [PATCH 3/6] restrict linting to pushes/prs with php files --- .github/workflows/linting.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 307ec6a4..9249e13b 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -3,8 +3,12 @@ name: Lint on: push: branches: [ develop ] + paths: + - '**.php' pull_request: branches: [ develop ] + paths: + - '**.php' workflow_dispatch: env: From d0de8fe6ce082e70fc0b1dba1596c2c448e74e78 Mon Sep 17 00:00:00 2001 From: IanDelMar <42134098+IanDelMar@users.noreply.github.com> Date: Fri, 11 Mar 2022 00:29:30 +0100 Subject: [PATCH 4/6] use environment variable for php version --- .github/workflows/linting.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 9249e13b..c7c3d9a9 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -144,7 +144,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.4' + php-version: ${{ env.php-version }} tools: composer, cs2pr coverage: none From 67ea6a5192ff8aead55cceb7dd4b6c49d2bb99da Mon Sep 17 00:00:00 2001 From: IanDelMar <42134098+IanDelMar@users.noreply.github.com> Date: Fri, 11 Mar 2022 00:32:31 +0100 Subject: [PATCH 5/6] remove unused output --- .github/workflows/linting.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index c7c3d9a9..25ecd76e 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -36,8 +36,6 @@ jobs: - name: Get Composer cache directory id: composer-cache - run: | - echo "::set-output name=dir::$(composer config cache-files-dir)" - uses: actions/cache@v2 with: path: vendor From 577e6155a2f1c2b08c2b31f2f1b472dc0ce0c4c3 Mon Sep 17 00:00:00 2001 From: IanDelMar <42134098+IanDelMar@users.noreply.github.com> Date: Fri, 11 Mar 2022 00:57:04 +0100 Subject: [PATCH 6/6] add php setup to php-lint job --- .github/workflows/linting.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 25ecd76e..4825a942 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -70,6 +70,13 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ env.php-version }} + tools: composer, cs2pr + coverage: none + - name: Get Composer cache directory id: composer-cache uses: actions/cache@v2