Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fluid-project/hearth-components
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4496a1b507f958759d6d164f2a8812df352492a3
Choose a base ref
..
head repository: fluid-project/hearth-components
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 46e0e2719a25f30ca6a9c582cecebe19d9a749cc
Choose a head ref
Showing with 89 additions and 63 deletions.
  1. +1 −1 .github/workflows/phpstan.yml
  2. +9 −6 .github/workflows/run-tests.yml
  3. +2 −2 composer.json
  4. +77 −54 package-lock.json
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.3'
php-version: '8.4'
coverage: none

- name: Install composer dependencies
15 changes: 9 additions & 6 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
@@ -13,13 +13,16 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.3, 8.2]
laravel: [11.*]
php: [8.4, 8.3]
laravel: [12.*, 11.*]
stability: [prefer-lowest, prefer-stable]
include:
- laravel: 11.*
testbench: 9.*
carbon: ^2.63
- laravel: 12.*
testbench: 10.*
carbon: 3.*

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

@@ -49,15 +52,15 @@ jobs:

- name: Execute tests
run: vendor/bin/pest --ci
if: matrix.laravel != '11.*' && matrix.php != 8.3 || matrix.stability != 'prefer-stable' || matrix.os != 'ubuntu-latest'
if: matrix.laravel != '12.*' && matrix.php != 8.4 || matrix.stability != 'prefer-stable' || matrix.os != 'ubuntu-latest'

- name: Execute tests with coverage
run: vendor/bin/pest --ci --coverage-clover coverage.xml
if: matrix.laravel == '11.*' && matrix.php == 8.3 && matrix.stability == 'prefer-stable' && matrix.os == 'ubuntu-latest'
if: matrix.laravel == '12.*' && matrix.php == 8.4 && matrix.stability == 'prefer-stable' && matrix.os == 'ubuntu-latest'

- name: Save code coverage to artifact
uses: actions/upload-artifact@v4
if: matrix.laravel == '11.*' && matrix.php == 8.3 && matrix.stability == 'prefer-stable' && matrix.os == 'ubuntu-latest'
if: matrix.laravel == '12.*' && matrix.php == 8.4 && matrix.stability == 'prefer-stable' && matrix.os == 'ubuntu-latest'
with:
name: code-coverage
path: "coverage.xml"
@@ -77,4 +80,4 @@ jobs:
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: true
fail_ci_if_error: true
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@
}
],
"require": {
"php": "^8.2|^8.3",
"php": "^8.3|^8.4",
"chinleung/laravel-locales": "^2.1",
"codezero/laravel-unique-translation": "^4.3",
"commerceguys/intl": "^2.0",
"illuminate/contracts": "^11.0",
"illuminate/contracts": "^11.0|^12.0",
"livewire/livewire": "^3.5",
"spatie/laravel-package-tools": "^1.16",
"spatie/laravel-sluggable": "^3.6",
131 changes: 77 additions & 54 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.