Skip to content

Commit f59261b

Browse files
authored
Merge branch 'master' into feature/replace-psalm
2 parents 0514034 + 3062fd4 commit f59261b

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

.github/workflows/documentation.yml

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

2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222

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

.github/workflows/php.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
git config --global core.autocrlf false
7171
git config --global core.eol lf
7272
73-
- uses: actions/checkout@v4
73+
- uses: actions/checkout@v5
7474

7575
- name: Get composer cache directory
7676
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
@@ -133,7 +133,7 @@ jobs:
133133
git config --global core.autocrlf false
134134
git config --global core.eol lf
135135
136-
- uses: actions/checkout@v4
136+
- uses: actions/checkout@v5
137137

138138
- name: Get composer cache directory
139139
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
@@ -170,7 +170,15 @@ jobs:
170170
- name: Setup problem matchers for PHP
171171
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
172172

173-
- uses: actions/checkout@v4
173+
- name: Setup problem matchers for PHPUnit
174+
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
175+
176+
- name: Set git to use LF
177+
run: |
178+
git config --global core.autocrlf false
179+
git config --global core.eol lf
180+
181+
- uses: actions/checkout@v5
174182

175183
- name: Get composer cache directory
176184
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
@@ -224,7 +232,15 @@ jobs:
224232
- name: Setup problem matchers for PHP
225233
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
226234

227-
- uses: actions/checkout@v4
235+
- name: Setup problem matchers for PHPUnit
236+
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
237+
238+
- name: Set git to use LF
239+
run: |
240+
git config --global core.autocrlf false
241+
git config --global core.eol lf
242+
243+
- uses: actions/checkout@v5
228244

229245
- name: Get composer cache directory
230246
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
@@ -254,9 +270,9 @@ jobs:
254270
needs: [unit-tests-linux]
255271

256272
steps:
257-
- uses: actions/checkout@v4
273+
- uses: actions/checkout@v5
258274

259-
- uses: actions/download-artifact@v4
275+
- uses: actions/download-artifact@v5
260276
with:
261277
name: coverage-data
262278
path: ${{ github.workspace }}/build

0 commit comments

Comments
 (0)