Skip to content

Commit ee7e884

Browse files
committed
Merge branch '2.10.x' into 2.11.x
* 2.10.x: Bump CI workflows (#1724)
2 parents 888d37f + 42f5834 commit ee7e884

File tree

6 files changed

+13
-17
lines changed

6 files changed

+13
-17
lines changed

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ on:
1212
jobs:
1313
coding-standards:
1414
name: "Coding Standards"
15-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@2.1.0"
15+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.1.0"
1616
with:
1717
composer-options: "--prefer-dist --prefer-stable"

.github/workflows/composer-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ on:
1515
jobs:
1616
composer-lint:
1717
name: "Composer Lint"
18-
uses: "doctrine/.github/.github/workflows/composer-lint.yml@2.1.0"
18+
uses: "doctrine/.github/.github/workflows/composer-lint.yml@3.1.0"

.github/workflows/continuous-integration.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
phpunit:
1414
name: "PHPUnit"
15-
runs-on: "ubuntu-20.04"
15+
runs-on: "ubuntu-22.04"
1616
env:
1717
SYMFONY_REQUIRE: ${{matrix.symfony-require}}
1818
SYMFONY_DEPRECATIONS_HELPER: weak
@@ -67,7 +67,7 @@ jobs:
6767

6868
steps:
6969
- name: "Checkout"
70-
uses: "actions/checkout@v3"
70+
uses: "actions/checkout@v4"
7171
with:
7272
fetch-depth: 2
7373

@@ -78,9 +78,7 @@ jobs:
7878
coverage: "pcov"
7979
ini-values: "zend.assertions=1"
8080
extensions: "pdo_sqlite"
81-
82-
- name: "Globally install symfony/flex"
83-
run: "composer require --no-progress --no-scripts --no-plugins symfony/flex"
81+
tools: "flex"
8482

8583
- name: "Require symfony/messenger"
8684
run: "composer require --dev symfony/messenger --no-update"
@@ -111,13 +109,13 @@ jobs:
111109

112110
upload_coverage:
113111
name: "Upload coverage to Codecov"
114-
runs-on: "ubuntu-20.04"
112+
runs-on: "ubuntu-22.04"
115113
needs:
116114
- "phpunit"
117115

118116
steps:
119117
- name: "Checkout"
120-
uses: "actions/checkout@v3"
118+
uses: "actions/checkout@v4"
121119
with:
122120
fetch-depth: 2
123121

.github/workflows/release-on-milestone-closed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
release:
1010
name: "Git tag, release & create merge-up PR"
11-
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@2.1.0"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.1.0"
1212
secrets:
1313
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
1414
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
static-analysis-psalm:
1414
name: "Static Analysis with Psalm"
15-
runs-on: "ubuntu-20.04"
15+
runs-on: "ubuntu-22.04"
1616

1717
strategy:
1818
matrix:
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: "Checkout code"
24-
uses: "actions/checkout@v3"
24+
uses: "actions/checkout@v4"
2525

2626
- name: "Install PHP"
2727
uses: "shivammathur/setup-php@v2"

.github/workflows/test-dev-stability.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
phpunit:
1010
name: "PHPUnit"
11-
runs-on: "ubuntu-20.04"
11+
runs-on: "ubuntu-22.04"
1212
env:
1313
SYMFONY_REQUIRE: ${{matrix.symfony-require}}
1414

@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: "Checkout"
30-
uses: "actions/checkout@v3"
30+
uses: "actions/checkout@v4"
3131
with:
3232
fetch-depth: 2
3333

@@ -37,9 +37,7 @@ jobs:
3737
php-version: "${{ matrix.php-version }}"
3838
ini-values: "zend.assertions=1"
3939
extensions: "pdo_sqlite"
40-
41-
- name: "Globally install symfony/flex"
42-
run: "composer require --no-progress --no-scripts --no-plugins symfony/flex"
40+
tools: "flex"
4341

4442
- name: "Require symfony/messenger"
4543
run: "composer require --dev symfony/messenger --no-update"

0 commit comments

Comments
 (0)