Skip to content

Commit fbebdd7

Browse files
committed
Adjust workflow cleanup
1 parent 88b6acb commit fbebdd7

4 files changed

Lines changed: 16 additions & 52 deletions

File tree

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ updates:
77
interval: "weekly"
88
cooldown:
99
default-days: 7
10+
groups:
11+
github-actions:
12+
patterns:
13+
- "*"
1014
ignore:
1115
- dependency-name: "yiisoft/*"
1216

@@ -17,4 +21,8 @@ updates:
1721
interval: "daily"
1822
cooldown:
1923
default-days: 7
24+
groups:
25+
composer-dependencies:
26+
patterns:
27+
- "*"
2028
versioning-strategy: increase-if-necessary

.github/workflows/bc.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ jobs:
1212
uses: yiisoft/actions/.github/workflows/bc.yml@master
1313
with:
1414
php: '["8.4"]'
15-
composer-require-options: '--with-all-dependencies --ignore-platform-req=php --no-progress --ansi'

.github/workflows/static.yml

Lines changed: 7 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -25,54 +25,11 @@ permissions:
2525
contents: read
2626

2727
jobs:
28-
mutation:
29-
name: PHP ${{ matrix.php }}-${{ matrix.os }}
30-
31-
env:
28+
psalm:
29+
uses: yiisoft/actions/.github/workflows/psalm.yml@master
30+
with:
3231
extensions: pdo, pdo_pgsql
33-
34-
runs-on: ${{ matrix.os }}
35-
36-
strategy:
37-
matrix:
38-
os:
39-
- ubuntu-latest
40-
41-
php:
42-
- 7.4
43-
- 8.0
44-
- 8.1
45-
46-
steps:
47-
- name: Checkout
48-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
49-
with:
50-
persist-credentials: false
51-
52-
- name: Install PHP
53-
uses: shivammathur/setup-php@b604ade2a87db23f8871b7182e69ec5e75effb45
54-
with:
55-
php-version: ${{ matrix.php }}
56-
extensions: ${{ env.extensions }}
57-
tools: composer:v2, cs2pr
58-
coverage: none
59-
60-
- name: Determine composer cache directory
61-
run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
62-
63-
- name: Cache dependencies installed with composer
64-
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9
65-
with:
66-
path: ${{ env.COMPOSER_CACHE_DIR }}
67-
key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
68-
restore-keys: |
69-
php${{ matrix.php }}-composer-
70-
71-
- name: Update composer
72-
run: composer self-update
73-
74-
- name: Install dependencies with composer
75-
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
76-
77-
- name: Static analysis
78-
run: vendor/bin/psalm --shepherd --stats --output-format=checkstyle | cs2pr --graceful-warnings --colorize
32+
os: >-
33+
["ubuntu-latest"]
34+
php: >-
35+
["7.4","8.0","8.1"]

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"yiisoft/mutex": "^1.1"
3333
},
3434
"require-dev": {
35-
"phpunit/phpunit": "^9.5",
35+
"phpunit/phpunit": "^10.1",
3636
"roave/infection-static-analysis-plugin": "^1.16",
3737
"spatie/phpunit-watcher": "^1.23",
3838
"vimeo/psalm": "^4.30|^5.3"

0 commit comments

Comments
 (0)