From f1bc1e53287bc93e6e7f328b863c30075b043a8e Mon Sep 17 00:00:00 2001
From: Luca Patera <lucapatera@outlook.it>
Date: Sun, 10 Mar 2024 15:55:24 +0100
Subject: [PATCH] Ah! x2

---
 .github/workflows/php.yml | 16 +++++-----------
 composer.json             |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index b86694f..de679ac 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -11,13 +11,17 @@ jobs:
             matrix:
                 php: [ 8.2, 8.3 ]
                 laravel: [9.*, 10.*, 11.*]
+                termwind: [1.*, 2.*]
                 include:
                     -   laravel: 11.*
                         testbench: 9.*
+                        termwind: 2.*
                     -   laravel: 10.*
                         testbench: 8.*
+                        termwind: 1.*
                     -   laravel: 9.*
                         testbench: 7.*
+                        termwind: 1.*
 
         name: PHP ${{ matrix.php }} + Laravel ${{ matrix.laravel }}
         steps:
@@ -32,19 +36,9 @@ jobs:
             -   name: Validate composer.json and composer.lock
                 run: composer validate
 
-            -   name: Cache Composer packages
-                id: composer-cache
-                uses: actions/cache@v2
-                with:
-                    path: vendor
-                    key: ${{ runner.os }}-php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }}
-                    restore-keys: |
-                        ${{ runner.os }}-php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-
-
             -   name: Install dependencies
-                if: steps.composer-cache.outputs.cache-hit != 'true'
                 run: |
-                    composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+                    composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nunomaduro/termwind:${{ matrix.termwind }}" --no-interaction --no-update
                     composer update --prefer-dist --no-interaction --no-suggest
 
             -   name: Run test suite
diff --git a/composer.json b/composer.json
index 9837de8..968fd63 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
   "prefer-stable": true,
   "require": {
     "php": "^8.2",
-    "nunomaduro/termwind": "^2.0",
+    "nunomaduro/termwind": "^1.0|^2.0",
     "nutgram/nutgram": "^4.11.0"
   },
   "require-dev": {