Skip to content

Commit

Permalink
Next-gen coding standard workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
ondrejmirtes committed May 26, 2023
1 parent a7ce75f commit 7aa403a
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 449 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ tmp export-ignore
.gitattributes export-ignore
.gitignore export-ignore
Makefile export-ignore
phpcs.xml export-ignore
phpstan.neon export-ignore
phpunit.xml export-ignore
5 changes: 0 additions & 5 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@
"enabled": true,
"groupName": "root-composer"
},
{
"matchPaths": ["build-cs/**"],
"enabled": true,
"groupName": "build-cs"
},
{
"matchPaths": [".github/**"],
"enabled": true,
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: "Lint"
run: "make lint"

coding-standards:
coding-standard:
name: "Coding Standard"

runs-on: "ubuntu-latest"
Expand All @@ -51,18 +51,28 @@ jobs:
- name: "Checkout"
uses: actions/checkout@v3

- name: "Checkout build-cs"
uses: actions/checkout@v3
with:
repository: "phpstan/build-cs"
path: "build-cs"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
with:
coverage: "none"
php-version: "8.0"
php-version: "8.2"

- name: "Validate Composer"
run: "composer validate"

- name: "Install dependencies"
run: "composer install --no-interaction --no-progress"

- name: "Install build-cs dependencies"
working-directory: "build-cs"
run: "composer install --no-interaction --no-progress"

- name: "Lint"
run: "make lint"

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/src/GeneratedConfig.php
/build-cs
/vendor
/composer.lock
.phpunit.result.cache
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ lint:
php vendor/bin/parallel-lint --colors \
src

.PHONY: cs-install
cs-install:
git clone https://github.com/phpstan/build-cs.git || true
git -C build-cs fetch origin && git -C build-cs reset --hard origin/main
composer install --working-dir build-cs

.PHONY: cs
cs:
composer install --working-dir build-cs && php build-cs/vendor/bin/phpcs
php build-cs/vendor/bin/phpcs src

.PHONY: cs-fix
cs-fix:
php build-cs/vendor/bin/phpcbf
php build-cs/vendor/bin/phpcbf src

.PHONY: phpstan
phpstan:
Expand Down
1 change: 0 additions & 1 deletion build-cs/.gitignore

This file was deleted.

13 changes: 0 additions & 13 deletions build-cs/composer.json

This file was deleted.

Loading

0 comments on commit 7aa403a

Please sign in to comment.