Skip to content

Commit 4ed6d97

Browse files
committed
Chore: Update Laravel version to ^v12.1 and improve workflow formatting
1 parent ddac4ae commit 4ed6d97

File tree

3 files changed

+176
-184
lines changed

3 files changed

+176
-184
lines changed

.github/workflows/tests.yml

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,46 @@
11
name: Tests
22

3-
on: ['push', 'pull_request']
3+
on:
4+
- push
5+
- pull_request
46

57
jobs:
68
ci:
79
runs-on: ${{ matrix.os }}
10+
811
strategy:
912
fail-fast: true
1013
matrix:
1114
os: [ubuntu-latest]
12-
php: [8.2, 8.3]
13-
laravel: [12.*]
15+
php: [8.2, 8.3, 8.4]
16+
laravel: ['12.*']
1417
dependency-version: [prefer-stable]
1518

1619
name: Tests P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
17-
steps:
1820

19-
- name: Checkout
20-
uses: actions/checkout@v4
21-
22-
- name: Cache dependencies
23-
uses: actions/cache@v4
24-
with:
25-
path: ~/.composer/cache/files
26-
key: dependencies-php-${{ matrix.php }}-L${{ matrix.laravel }}-${{ matrix.dependency-version }}-composer-${{ hashFiles('composer.json') }}
27-
28-
- name: Setup PHP
29-
uses: shivammathur/setup-php@v2
30-
with:
31-
php-version: ${{ matrix.php }}
32-
extensions: dom, mbstring, zip
33-
coverage: none
34-
35-
- name: Require Laravel Version
36-
run: >
37-
composer require
38-
"laravel/framework:${{ matrix.laravel }}"
39-
--no-interaction --no-update
40-
41-
- name: Install Composer dependencies
42-
run: composer update --${{ matrix.dependency-version }} --no-interaction --prefer-dist
43-
44-
- name: Integration Tests
45-
run: php ./vendor/bin/pest
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v4
24+
25+
- name: Cache dependencies
26+
uses: actions/cache@v4
27+
with:
28+
path: ~/.composer/cache/files
29+
key: dependencies-php-${{ matrix.php }}-L${{ matrix.laravel }}-${{ matrix.dependency-version }}-composer-${{ hashFiles('composer.json') }}
30+
31+
- name: Setup PHP
32+
uses: shivammathur/setup-php@v2
33+
with:
34+
php-version: ${{ matrix.php }}
35+
extensions: dom, mbstring, zip
36+
coverage: none
37+
38+
- name: Require Laravel Version
39+
run: |
40+
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
41+
42+
- name: Install Composer dependencies
43+
run: composer update --${{ matrix.dependency-version }} --no-interaction --prefer-dist
44+
45+
- name: Integration Tests
46+
run: php ./vendor/bin/pest

composer.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
22
"name": "devanoxltd/tailwind-class-merge-laravel",
33
"description": "TailwindClassMerge for Laravel merges multiple Tailwind CSS classes by automatically resolving conflicts between them",
4-
"keywords": ["laravel", "php", "tailwindcss", "merge", "classes"],
4+
"keywords": [
5+
"laravel",
6+
"php",
7+
"tailwindcss",
8+
"merge",
9+
"classes"
10+
],
511
"license": "MIT",
612
"authors": [
713
{
@@ -15,7 +21,7 @@
1521
},
1622
"require": {
1723
"php": "^8.2.0",
18-
"laravel/framework": "^v12.0",
24+
"laravel/framework": "^v12.1",
1925
"devanoxltd/tailwind-class-merge-php": "^v3.0"
2026
},
2127
"require-dev": {

0 commit comments

Comments
 (0)