Skip to content

Commit 9ae928c

Browse files
committed
Merge branch 'master' into document-release
# Conflicts: # CONTRIBUTING.md
2 parents 54603ec + 2de0a54 commit 9ae928c

233 files changed

Lines changed: 3034 additions & 1406 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
**Changes**
88

9-
<!-- Detail the changes in behaviour this PR introduces. -->
9+
<!-- Detail the changes in behavior this PR introduces. -->
1010

1111
**Breaking changes**
1212

.github/workflows/format.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414

1515
- uses: shivammathur/setup-php@v2
1616
with:
17+
php-version: 8.3
1718
coverage: none
1819
extensions: mbstring
19-
php-version: 8.3
2020

2121
- run: composer install --no-interaction --no-progress --no-suggest
2222

@@ -51,9 +51,9 @@ jobs:
5151

5252
- uses: shivammathur/setup-php@v2
5353
with:
54+
php-version: 8.3
5455
coverage: none
5556
extensions: mbstring
56-
php-version: 8.3
5757

5858
- run: composer install --no-interaction --no-progress --no-suggest
5959

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Build protobuf"
1+
name: "Generate proto code"
22
on:
33
push:
44
branches:
@@ -8,14 +8,16 @@ on:
88
- 'buf.gen.yaml'
99

1010
jobs:
11-
proto:
11+
generate-proto-code:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v4
1515
with:
1616
ref: ${{ github.head_ref }}
1717

18-
- uses: bufbuild/buf-setup-action@v1
18+
- uses: bufbuild/buf-action@v1
19+
with:
20+
setup_only: true
1921

2022
- run: |
2123
buf generate

.github/workflows/update-reports-proto.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: "Update reports.proto"
1+
name: "Update `reports.proto`"
22
on:
33
workflow_dispatch:
44
schedule:
55
- cron: "0 0 * * 0"
66

77
jobs:
8-
proto:
8+
update-reports-proto:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v4
@@ -22,7 +22,7 @@ jobs:
2222
2323
- uses: peter-evans/create-pull-request@v5
2424
with:
25-
title: 'Updated `reports.proto`'
26-
commit_message: Updated `reports.proto`
27-
branch: patch/update-reports-proto
25+
title: Update `reports.proto`
26+
commit-message: Update `reports.proto`
27+
branch: update-reports-proto
2828
delete-branch: true

.github/workflows/validate.yml

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
- "^9"
3333
- "^10"
3434
- "^11"
35+
- "^12"
3536
composer:
3637
- name: lowest
3738
arg: "--prefer-lowest --prefer-stable"
@@ -44,15 +45,19 @@ jobs:
4445
laravel-version: "^11"
4546
- php-version: "8.1"
4647
laravel-version: "^11"
48+
- php-version: "8.0"
49+
laravel-version: "^12"
50+
- php-version: "8.1"
51+
laravel-version: "^12"
4752

4853
steps:
4954
- uses: actions/checkout@v4
5055

5156
- uses: shivammathur/setup-php@v2
5257
with:
58+
php-version: ${{ matrix.php-version }}
5359
coverage: none
5460
extensions: ${{ env.REQUIRED_PHP_EXTENSIONS }}
55-
php-version: ${{ matrix.php-version }}
5661

5762
- name: "Cache composer dependencies"
5863
uses: actions/cache@v3
@@ -63,7 +68,8 @@ jobs:
6368
- name: "Remove conflicting dependencies that are not needed here"
6469
run: composer remove --dev --no-update phpbench/phpbench rector/rector
6570

66-
- if: matrix.laravel-version != '^10'
71+
- name: "Remove Pennant for Laravel 9 because it is not compatible"
72+
if: matrix.laravel-version == '^9'
6773
run: composer remove --dev --no-update laravel/pennant
6874

6975
- run: >
@@ -94,6 +100,7 @@ jobs:
94100
- "^9"
95101
- "^10"
96102
- "^11"
103+
- "^12"
97104
os:
98105
- ubuntu-latest
99106
composer:
@@ -108,6 +115,10 @@ jobs:
108115
laravel-version: "^11"
109116
- php-version: "8.1"
110117
laravel-version: "^11"
118+
- php-version: "8.0"
119+
laravel-version: "^12"
120+
- php-version: "8.1"
121+
laravel-version: "^12"
111122

112123
services:
113124
mysql:
@@ -129,9 +140,10 @@ jobs:
129140

130141
- uses: shivammathur/setup-php@v2
131142
with:
143+
php-version: ${{ matrix.php-version }}
132144
coverage: none
133145
extensions: ${{ env.REQUIRED_PHP_EXTENSIONS }}
134-
php-version: ${{ matrix.php-version }}
146+
ini-values: zend.assertions=1
135147

136148
- name: "Cache composer dependencies"
137149
uses: actions/cache@v3
@@ -142,7 +154,8 @@ jobs:
142154
- name: "Remove conflicting dependencies that are not needed here"
143155
run: composer remove --dev --no-update larastan/larastan phpstan/phpstan-mockery phpbench/phpbench rector/rector
144156

145-
- if: matrix.laravel-version != '^10' && matrix.laravel-version != '^11'
157+
- name: "Remove Pennant for Laravel 9 because it is not compatible"
158+
if: matrix.laravel-version == '^9'
146159
run: composer remove --dev --no-update laravel/pennant
147160

148161
- run: >
@@ -162,7 +175,7 @@ jobs:
162175
strategy:
163176
matrix:
164177
php-version: ["8.4"]
165-
laravel-version: ["^11"]
178+
laravel-version: ["^12"]
166179

167180
services:
168181
mysql:
@@ -184,9 +197,10 @@ jobs:
184197

185198
- uses: shivammathur/setup-php@v2
186199
with:
200+
php-version: ${{ matrix.php-version }}
187201
coverage: pcov
188202
extensions: ${{ env.REQUIRED_PHP_EXTENSIONS }}
189-
php-version: ${{ matrix.php-version }}
203+
ini-values: zend.assertions=1
190204

191205
- name: "Cache composer dependencies"
192206
uses: actions/cache@v3
@@ -209,15 +223,16 @@ jobs:
209223
strategy:
210224
matrix:
211225
php-version: ["8.4"]
212-
laravel-version: ["^11"]
226+
laravel-version: ["^12"]
213227

214228
steps:
215229
- uses: actions/checkout@v4
216230

217231
- uses: shivammathur/setup-php@v2
218232
with:
219-
extensions: ${{ env.REQUIRED_PHP_EXTENSIONS }}
220233
php-version: ${{ matrix.php-version }}
234+
coverage: none
235+
extensions: ${{ env.REQUIRED_PHP_EXTENSIONS }}
221236

222237
- name: "Cache composer dependencies"
223238
uses: actions/cache@v3

0 commit comments

Comments
 (0)