Skip to content

Commit ad1eee1

Browse files
committed
Merge remote-tracking branch 'origin/master' into league/flysystem-v3
2 parents 392b1cb + 7b0159c commit ad1eee1

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.editorconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ indent_size = 4
1414
end_of_line = crlf
1515

1616
[*.yml]
17-
indent_size = 4
18-
19-
[*.json]
20-
indent_size = 4
17+
indent_size = 2
2118

2219
[*.neon]
2320
indent_style = tab

.github/workflows/ci.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: CI
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
pull_request:
6+
workflow_dispatch:
47

58
jobs:
69
testsuite:
@@ -17,7 +20,7 @@ jobs:
1720
- name: Setup PHP
1821
uses: shivammathur/setup-php@v2
1922
with:
20-
php-version: '8.1'
23+
php-version: ${{ matrix.php-version }}
2124
extensions: mbstring, json, fileinfo
2225
tools: pecl
2326
coverage: pcov

0 commit comments

Comments
 (0)