Skip to content

Commit 9a0afdb

Browse files
committed
Merge branch 'master' into release-2.x
2 parents 3a57215 + b2e7a1a commit 9a0afdb

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: [ubuntu-latest]
2020

2121
steps:
22-
- uses: actions/checkout@v6
22+
- uses: actions/checkout@v7
2323

2424
- name: Lint markdown files
2525
uses: nosborn/github-action-markdown-cli@v3

.github/workflows/php.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ jobs:
7171
git config --global core.autocrlf false
7272
git config --global core.eol lf
7373
74-
- uses: actions/checkout@v6
74+
- uses: actions/checkout@v7
7575

7676
- name: Get composer cache directory
7777
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
7878

7979
- name: Cache composer dependencies
80-
uses: actions/cache@v5
80+
uses: actions/cache@v6
8181
with:
8282
path: ${{ env.COMPOSER_CACHE }}
8383
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -133,13 +133,13 @@ jobs:
133133
git config --global core.autocrlf false
134134
git config --global core.eol lf
135135
136-
- uses: actions/checkout@v6
136+
- uses: actions/checkout@v7
137137

138138
- name: Get composer cache directory
139139
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
140140

141141
- name: Cache composer dependencies
142-
uses: actions/cache@v5
142+
uses: actions/cache@v6
143143
with:
144144
path: ${{ env.COMPOSER_CACHE }}
145145
key: ${{ runner.os }}-composer-${{ hashFiles('**\composer.json') }}
@@ -170,13 +170,13 @@ jobs:
170170
- name: Setup problem matchers for PHP
171171
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
172172

173-
- uses: actions/checkout@v6
173+
- uses: actions/checkout@v7
174174

175175
- name: Get composer cache directory
176176
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
177177

178178
- name: Cache composer dependencies
179-
uses: actions/cache@v5
179+
uses: actions/cache@v6
180180
with:
181181
path: ${{ env.COMPOSER_CACHE }}
182182
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -213,13 +213,13 @@ jobs:
213213
- name: Setup problem matchers for PHP
214214
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
215215

216-
- uses: actions/checkout@v6
216+
- uses: actions/checkout@v7
217217

218218
- name: Get composer cache directory
219219
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
220220

221221
- name: Cache composer dependencies
222-
uses: actions/cache@v5
222+
uses: actions/cache@v6
223223
with:
224224
path: ${{ env.COMPOSER_CACHE }}
225225
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -254,15 +254,15 @@ jobs:
254254
needs: [unit-tests-linux]
255255

256256
steps:
257-
- uses: actions/checkout@v6
257+
- uses: actions/checkout@v7
258258

259259
- uses: actions/download-artifact@v8
260260
with:
261261
name: coverage-data
262262
path: ${{ github.workspace }}/build
263263

264264
- name: Codecov
265-
uses: codecov/codecov-action@v6
265+
uses: codecov/codecov-action@v7
266266
with:
267267
token: ${{ secrets.CODECOV_TOKEN }}
268268
fail_ci_if_error: true

0 commit comments

Comments
 (0)