Skip to content

Commit 86f67a2

Browse files
authored
Merge pull request #52 from doctrine/maintenance
2 parents d29f373 + 0d3ee08 commit 86f67a2

File tree

7 files changed

+15
-40
lines changed

7 files changed

+15
-40
lines changed

.github/workflows/coding-standards.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,9 @@ on:
2121

2222
jobs:
2323
coding-standards:
24-
name: "Coding Standards"
24+
name: "Coding Standards (PHP: ${{ inputs.php-version }})"
2525
runs-on: "ubuntu-22.04"
2626

27-
strategy:
28-
matrix:
29-
php-version:
30-
- "${{ inputs.php-version }}"
31-
3227
steps:
3328
- name: "Checkout"
3429
uses: "actions/checkout@v4"
@@ -37,7 +32,7 @@ jobs:
3732
uses: "shivammathur/setup-php@v2"
3833
with:
3934
coverage: "none"
40-
php-version: "${{ matrix.php-version }}"
35+
php-version: "${{ inputs.php-version }}"
4136
tools: "cs2pr"
4237

4338
- name: "Set COMPOSER_ROOT_VERSION"

.github/workflows/composer-lint.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,9 @@ on:
1212

1313
jobs:
1414
composer-lint:
15-
name: "Composer Lint"
15+
name: "Composer Lint (PHP: ${{ inputs.php-version }})"
1616
runs-on: "ubuntu-22.04"
1717

18-
strategy:
19-
matrix:
20-
php-version:
21-
- "${{ inputs.php-version }}"
22-
2318
steps:
2419
- name: "Checkout"
2520
uses: "actions/checkout@v4"
@@ -28,7 +23,7 @@ jobs:
2823
uses: "shivammathur/setup-php@v2"
2924
with:
3025
coverage: "none"
31-
php-version: "${{ matrix.php-version }}"
26+
php-version: "${{ inputs.php-version }}"
3227
tools: composer:v2, composer-normalize:2
3328
env:
3429
COMPOSER_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/documentation.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ jobs:
99
name: "phpDocumentor Guides"
1010
runs-on: "ubuntu-22.04"
1111

12-
strategy:
13-
matrix:
14-
php-version:
15-
- "8.3" # Use the same version as in doctrine/doctrine-website
16-
1712
steps:
1813
- name: "Checkout"
1914
uses: "actions/checkout@v4"
@@ -22,7 +17,7 @@ jobs:
2217
uses: "shivammathur/setup-php@v2"
2318
with:
2419
coverage: "none"
25-
php-version: "${{ matrix.php-version }}"
20+
php-version: "8.3" # Use the same version as in doctrine/doctrine-website
2621
tools: "cs2pr"
2722

2823
# Some of our dependencies have supported branches where they still need

.github/workflows/static-analysis.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,9 @@ on:
2121

2222
jobs:
2323
phpstan:
24-
name: "PHPStan"
24+
name: "PHPStan (PHP: ${{ inputs.php-version }})"
2525
runs-on: "ubuntu-22.04"
2626

27-
strategy:
28-
matrix:
29-
php-version:
30-
- "${{ inputs.php-version }}"
31-
3227
steps:
3328
- name: "Checkout code"
3429
uses: "actions/checkout@v4"
@@ -37,7 +32,7 @@ jobs:
3732
uses: "shivammathur/setup-php@v2"
3833
with:
3934
coverage: "none"
40-
php-version: "${{ matrix.php-version }}"
35+
php-version: "${{ inputs.php-version }}"
4136

4237
- name: "Set COMPOSER_ROOT_VERSION"
4338
run: |
@@ -54,14 +49,9 @@ jobs:
5449
run: "vendor/bin/phpstan analyse -v"
5550

5651
psalm:
57-
name: "Psalm"
52+
name: "Psalm (PHP: ${{ inputs.php-version }})"
5853
runs-on: "ubuntu-22.04"
5954

60-
strategy:
61-
matrix:
62-
php-version:
63-
- "${{ inputs.php-version }}"
64-
6555
steps:
6656
- name: "Checkout code"
6757
uses: "actions/checkout@v4"
@@ -70,7 +60,7 @@ jobs:
7060
uses: "shivammathur/setup-php@v2"
7161
with:
7262
coverage: "none"
73-
php-version: "${{ matrix.php-version }}"
63+
php-version: "${{ inputs.php-version }}"
7464

7565
- name: "Set COMPOSER_ROOT_VERSION"
7666
run: |

workflow-templates/coding-standards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
paths:
99
- ".github/workflows/coding-standards.yml"
1010
- "composer.*"
11-
- "src/**" # but some packages use lib
11+
- "src/**"
1212
- "phpcs.xml.dist"
1313
- "tests/**"
1414
push:
@@ -17,7 +17,7 @@ on:
1717
paths:
1818
- ".github/workflows/coding-standards.yml"
1919
- "composer.*"
20-
- "src/**" # but some packages use lib
20+
- "src/**"
2121
- "phpcs.xml.dist"
2222
- "tests/**"
2323

workflow-templates/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
paths:
88
- ".github/workflows/continuous-integration.yml"
99
- "composer.*"
10-
- "src/**" # but some packages use lib
10+
- "src/**"
1111
- "phpunit.xml.dist"
1212
- "tests/**"
1313
push:
@@ -16,7 +16,7 @@ on:
1616
paths:
1717
- ".github/workflows/continuous-integration.yml"
1818
- "composer.*"
19-
- "src/**" # but some packages use lib
19+
- "src/**"
2020
- "phpunit.xml.dist"
2121
- "tests/**"
2222

workflow-templates/static-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
paths:
99
- ".github/workflows/static-analysis.yml"
1010
- "composer.*"
11-
- "src/**" # but some packages use lib
11+
- "src/**"
1212
- "phpstan*"
1313
- "psalm*"
1414
- "tests/**"
@@ -18,7 +18,7 @@ on:
1818
paths:
1919
- ".github/workflows/static-analysis.yml"
2020
- "composer.*"
21-
- "src/**" # but some packages use lib
21+
- "src/**"
2222
- "phpstan*"
2323
- "psalm*"
2424
- "tests/**"

0 commit comments

Comments
 (0)