Skip to content

Commit 4b60b2d

Browse files
authored
Merge pull request #375 from FriendsOfCake/ci
Update CI config
2 parents 32059df + d787591 commit 4b60b2d

File tree

10 files changed

+232
-22
lines changed

10 files changed

+232
-22
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
POSTGRES_PASSWORD: postgres
3030

3131
steps:
32-
- uses: actions/checkout@v2
32+
- uses: actions/checkout@v3
3333

3434
- name: Setup PHP
3535
uses: shivammathur/setup-php@v2
@@ -57,25 +57,26 @@ jobs:
5757
else
5858
vendor/bin/phpunit
5959
fi
60+
continue-on-error: ${{ matrix.prefer-lowest == 'prefer-lowest' }}
6061

6162
- name: Code Coverage Report
6263
if: matrix.php-version == '7.4'
63-
uses: codecov/codecov-action@v2
64+
uses: codecov/codecov-action@v3
6465

6566
cs-stan:
6667
name: Coding Standard & Static Analysis
6768
runs-on: ubuntu-18.04
6869

6970
steps:
70-
- uses: actions/checkout@v2
71+
- uses: actions/checkout@v3
7172

7273
- name: Setup PHP
7374
uses: shivammathur/setup-php@v2
7475
with:
7576
php-version: '7.4'
7677
extensions: mbstring, intl
7778
coverage: none
78-
tools: cs2pr, vimeo/psalm:4.21, phpstan:1.4
79+
tools: cs2pr, vimeo/psalm:4.23, phpstan:1.7
7980

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

8687
- name: Run psalm
87-
if: success() || failure()
88+
if: always()
8889
run: psalm --output-format=github
8990

9091
- name: Run phpstan
91-
if: success() || failure()
92+
if: always()
9293
run: phpstan analyse

composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@
4646
],
4747
"cs-check": "phpcs -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP --ignore=comparisons src/ tests/",
4848
"cs-fix": "phpcbf --standard=vendor/cakephp/cakephp-codesniffer/CakePHP --ignore=comparisons src/ tests/",
49-
"stan": "phpstan analyse && psalm.phar",
50-
"psalm": "psalm.phar",
51-
"stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^1.4 psalm/phar:^4.21 && mv composer.backup composer.json",
5249
"test": "phpunit"
5350
},
5451
"config": {

package-lock.json

Lines changed: 50 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
3-
"@popperjs/core": "^2.10.2",
4-
"bootstrap": "^5.1.3",
5-
"bootstrap-icons": "^1.6.1"
3+
"@popperjs/core": "^2.9.2",
4+
"bootstrap": "^5.0.1",
5+
"bootstrap-icons": "^1.5.0"
66
}
77
}

0 commit comments

Comments
 (0)