From bf98de51a55671239e1066abd161df8c2017262d Mon Sep 17 00:00:00 2001 From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com> Date: Wed, 13 Mar 2024 23:45:47 +0000 Subject: [PATCH 1/2] Feature | Support Laravel 11 --- .github/workflows/tests.yml | 27 +++++++++++++++++---------- composer.json | 12 ++++++------ 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8769290..7a0bafd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,16 +12,26 @@ permissions: contents: write jobs: - tests: + test: runs-on: ${{ matrix.os }} + strategy: fail-fast: true matrix: - os: [ ubuntu-latest, windows-latest ] - php: [ 8.1, 8.2, 8.3 ] - stability: [ prefer-lowest, prefer-stable ] - - name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }} + os: [ubuntu-latest, windows-latest] + php: [8.1, 8.2, 8.3] + laravel: ['10.*', '11.*'] + stability: [prefer-lowest, prefer-stable] + include: + - laravel: 10.* + testbench: 8.* + - laravel: 11.* + testbench: 9.* + exclude: + - laravel: 11.* + php: 8.1 + + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} steps: - name: Checkout code @@ -34,10 +44,6 @@ jobs: extensions: mbstring, zip, fileinfo coverage: none - - name: Install Node Dependencies - run: | - npm install - - name: Setup problem matchers run: | echo "::add-matcher::${{ runner.tool_cache }}/php.json" @@ -45,6 +51,7 @@ jobs: - name: Install dependencies run: | + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: Execute tests diff --git a/composer.json b/composer.json index 2834d4c..dc401a4 100644 --- a/composer.json +++ b/composer.json @@ -14,15 +14,15 @@ "php": "^8.1", "ext-json": "*", "ext-zip": "*", - "illuminate/console": "^9.0 || ^10.0", - "illuminate/filesystem": "^9.0 || ^10.0", - "illuminate/support": "^9.0 || ^10.0", - "symfony/finder": "^6.0", - "symfony/process": "^6.0", + "illuminate/console": "^10.0 || ^11.0", + "illuminate/filesystem": "^10.0 || ^11.0", + "illuminate/support": "^10.0 || ^11.0", + "symfony/finder": "^6.0 || ^7.0", + "symfony/process": "^6.0 || ^7.0", "league/flysystem": "^3.0" }, "require-dev": { - "orchestra/testbench": "^7.0 || ^8.0", + "orchestra/testbench": "^8.0 || ^9.0", "friendsofphp/php-cs-fixer": "^3.1.0", "spatie/ray": "^1.33", "pestphp/pest": "^2.25", From cad9bef6ac98e2a406369f9f0c087bb4540f7e80 Mon Sep 17 00:00:00 2001 From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com> Date: Wed, 13 Mar 2024 23:47:36 +0000 Subject: [PATCH 2/2] Added npm install --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7a0bafd..ce3902d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -53,6 +53,7 @@ jobs: run: | composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction + npm install - name: Execute tests run: ./vendor/bin/pest