Skip to content

Commit c2a6018

Browse files
committed
Merge branch '2.x'
2 parents f7c9328 + 3241c92 commit c2a6018

File tree

128 files changed

+3854
-2820
lines changed

Some content is hidden

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

128 files changed

+3854
-2820
lines changed

Diff for: .github/workflows/pull-requests.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: pull requests
2+
3+
on:
4+
pull_request_target:
5+
types: [opened]
6+
7+
permissions:
8+
pull-requests: write
9+
10+
jobs:
11+
uneditable:
12+
uses: laravel/.github/.github/workflows/pull-requests.yml@main

Diff for: .github/workflows/tests.yml

+53-9
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@ jobs:
1313
strategy:
1414
fail-fast: true
1515
matrix:
16-
php: [7.3, 7.4, '8.0', 8.1]
17-
laravel: [8, 9]
18-
exclude:
19-
- php: 7.3
20-
laravel: 9
21-
- php: 7.4
22-
laravel: 9
16+
php: ['8.0', 8.1]
17+
laravel: [9]
2318

2419
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
2520

@@ -32,13 +27,62 @@ jobs:
3227
with:
3328
php-version: ${{ matrix.php }}
3429
extensions: dom, curl, libxml, mbstring, zip
30+
ini-values: error_reporting=E_ALL
3531
tools: composer:v2
3632
coverage: none
3733

3834
- name: Install dependencies
3935
run: |
40-
composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-update
41-
composer update --prefer-dist --no-interaction --no-progress
36+
composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-update
37+
composer update --prefer-dist --no-interaction --no-progress
4238
4339
- name: Execute tests
4440
run: vendor/bin/phpunit --verbose
41+
42+
stub-tests:
43+
runs-on: ubuntu-20.04
44+
45+
strategy:
46+
fail-fast: true
47+
matrix:
48+
stack: [inertia, livewire]
49+
50+
name: Test Stubs (${{ matrix.stack }})
51+
52+
steps:
53+
- name: Setup PHP
54+
uses: shivammathur/setup-php@v2
55+
with:
56+
php-version: 8.1
57+
extensions: dom, curl, libxml, mbstring, zip
58+
ini-values: error_reporting=E_ALL
59+
tools: composer:v2
60+
coverage: none
61+
62+
- name: Setup Laravel
63+
run: |
64+
composer create-project laravel/laravel:^9 .
65+
composer require laravel/jetstream:^2
66+
rm -rf vendor/laravel/jetstream
67+
68+
- name: Checkout code
69+
uses: actions/checkout@v2
70+
with:
71+
path: 'vendor/laravel/jetstream'
72+
73+
- name: Install Jetstream
74+
run: |
75+
composer dump
76+
php artisan jetstream:install ${{ matrix.stack }} --teams --api --verification
77+
78+
- name: Install NPM dependencies
79+
run: npm i
80+
81+
- name: Compile assets
82+
run: npm run build
83+
84+
- name: Execute tests
85+
run: vendor/bin/phpunit --verbose
86+
env:
87+
DB_CONNECTION: sqlite
88+
DB_DATABASE: ":memory:"

Diff for: .github/workflows/update-changelog.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: update changelog
2+
3+
on:
4+
release:
5+
types: [released]
6+
7+
jobs:
8+
update:
9+
uses: laravel/.github/.github/workflows/update-changelog.yml@main

Diff for: .styleci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ php:
55
js:
66
finder:
77
not-name:
8-
- webpack.mix.js
8+
- vite.config.js
99
css: true

0 commit comments

Comments
 (0)