Skip to content

Commit

Permalink
Merge pull request #375 from FriendsOfCake/ci
Browse files Browse the repository at this point in the history
Update CI config
  • Loading branch information
ADmad authored Jun 26, 2022
2 parents 32059df + d787591 commit 4b60b2d
Show file tree
Hide file tree
Showing 10 changed files with 232 additions and 22 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
POSTGRES_PASSWORD: postgres

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -57,25 +57,26 @@ jobs:
else
vendor/bin/phpunit
fi
continue-on-error: ${{ matrix.prefer-lowest == 'prefer-lowest' }}

- name: Code Coverage Report
if: matrix.php-version == '7.4'
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v3

cs-stan:
name: Coding Standard & Static Analysis
runs-on: ubuntu-18.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
extensions: mbstring, intl
coverage: none
tools: cs2pr, vimeo/psalm:4.21, phpstan:1.4
tools: cs2pr, vimeo/psalm:4.23, phpstan:1.7

- name: Composer Install
run: composer install
Expand All @@ -84,9 +85,9 @@ jobs:
run: vendor/bin/phpcs --report=checkstyle src/ tests/ | cs2pr

- name: Run psalm
if: success() || failure()
if: always()
run: psalm --output-format=github

- name: Run phpstan
if: success() || failure()
if: always()
run: phpstan analyse
3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@
],
"cs-check": "phpcs -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP --ignore=comparisons src/ tests/",
"cs-fix": "phpcbf --standard=vendor/cakephp/cakephp-codesniffer/CakePHP --ignore=comparisons src/ tests/",
"stan": "phpstan analyse && psalm.phar",
"psalm": "psalm.phar",
"stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^1.4 psalm/phar:^4.21 && mv composer.backup composer.json",
"test": "phpunit"
},
"config": {
Expand Down
60 changes: 50 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@popperjs/core": "^2.10.2",
"bootstrap": "^5.1.3",
"bootstrap-icons": "^1.6.1"
"@popperjs/core": "^2.9.2",
"bootstrap": "^5.0.1",
"bootstrap-icons": "^1.5.0"
}
}
Loading

0 comments on commit 4b60b2d

Please sign in to comment.