Skip to content

Commit 6b58646

Browse files
committed
fix(ci): replace upstream Laravel workflows with fork-specific CI
tests.yml was using laravel/sail:* and spinning up Docker containers via the upstream integration test. Replaced with a lighter workflow using reyemtech/sail:* that runs PHPUnit directly. static-analysis.yml was delegating to laravel/.github reusable workflow. Replaced with self-contained PHPStan job.
1 parent 5a5be21 commit 6b58646

2 files changed

Lines changed: 30 additions & 35 deletions

File tree

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,30 @@
1-
name: static analysis
1+
name: Static Analysis
22

33
on:
44
push:
5-
branches:
6-
- master
7-
- '*.x'
5+
branches: [1.x]
86
pull_request:
97

108
permissions:
119
contents: read
1210

1311
jobs:
14-
tests:
15-
uses: laravel/.github/.github/workflows/static-analysis.yml@main
12+
phpstan:
13+
runs-on: ubuntu-latest
14+
name: PHPStan
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
19+
- name: Setup PHP
20+
uses: shivammathur/setup-php@v2
21+
with:
22+
php-version: '8.4'
23+
tools: composer:v2
24+
coverage: none
25+
26+
- name: Install dependencies
27+
run: composer install --no-interaction --prefer-dist
28+
29+
- name: Run PHPStan
30+
run: vendor/bin/phpstan analyse src

.github/workflows/tests.yml

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
name: Docker Compose Test
1+
name: Tests
22

33
on:
44
push:
5-
branches:
6-
- master
7-
- '*.x'
5+
branches: [1.x]
86
pull_request:
97

108
permissions:
@@ -30,9 +28,8 @@ jobs:
3028
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
3129

3230
steps:
33-
3431
- name: Checkout code
35-
uses: actions/checkout@v6
32+
uses: actions/checkout@v4
3633
with:
3734
path: 'sail'
3835

@@ -41,42 +38,25 @@ jobs:
4138
with:
4239
php-version: ${{ matrix.php }}
4340
extensions: dom, curl, libxml, mbstring, zip, fileinfo
44-
ini-values: error_reporting=E_ALL
4541
tools: composer:v2
4642
coverage: none
4743

48-
- name: Create a new laravel application
44+
- name: Create a new Laravel application
4945
run: composer create-project laravel/laravel app "${{ matrix.laravel }}.x" --remove-vcs --no-interaction --prefer-dist
5046

51-
- name: Link Sail Repository
47+
- name: Link Sail repository
5248
run: |
5349
composer config minimum-stability dev
5450
composer config repositories.sail path ../sail
55-
composer require laravel/sail:* --dev -W
51+
composer require reyemtech/sail:* --dev -W
5652
working-directory: app
5753

58-
- name: Install Sail into App
54+
- name: Install Sail
5955
run: |
6056
php artisan sail:install --php=${{ matrix.php }} --no-interaction
6157
php artisan sail:publish --no-interaction
6258
working-directory: app
6359

64-
- name: Remove Sail
65-
run: composer remove laravel/sail --dev --no-interaction -W
66-
working-directory: app
67-
68-
- name: Start Sail Container
69-
run: ../sail/bin/sail up -d --wait
70-
working-directory: app
71-
72-
- name: Run Migrations
73-
run: ../sail/bin/sail artisan migrate --no-interaction
74-
working-directory: app
75-
76-
- name: Run Tests in Sail Container
77-
run: ../sail/bin/sail test
78-
working-directory: app
79-
80-
- name: Stop Sail Container
81-
run: ../sail/bin/sail down
60+
- name: Run PHPUnit tests
61+
run: cd ../sail && vendor/bin/phpunit
8262
working-directory: app

0 commit comments

Comments
 (0)