From 6cc451a7257002d39f4778986735f4274115382e Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 2 Mar 2024 08:47:17 +0000 Subject: [PATCH 1/4] Bump dependencies for Laravel 11 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index f3c1492..a8d4070 100644 --- a/composer.json +++ b/composer.json @@ -11,16 +11,16 @@ ], "require": { "php": "^8.1", - "illuminate/support": "^9.0|^10.0", + "illuminate/support": "^9.0|^10.0|^11.0", "hoa/compiler": "^3.17", "sanmai/hoa-protocol": "^1.17" }, "require-dev": { - "phpunit/phpunit": "^9.0", - "orchestra/testbench": "^7.0|^8.0" + "phpunit/phpunit": "^9.0|^10.5", + "orchestra/testbench": "^7.0|^8.0|^9.0" }, "autoload": { - "psr-4": { + "psr-4": { "Lorisleiva\\LaravelSearchString\\": "src" } }, From c02ba67e1496e6da1f3483292276995e430c32e1 Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 2 Mar 2024 08:47:17 +0000 Subject: [PATCH 2/4] Update GitHub Actions for Laravel 11 --- .github/workflows/tests.yml | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c1372da..e60b41b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,37 +1,52 @@ name: Tests -on: [push, pull_request] +on: + - push + - pull_request jobs: tests: runs-on: ${{ matrix.os }} + strategy: fail-fast: false matrix: os: [ubuntu-latest] - php: ["8.1", "8.2"] - laravel: ["^9.0", "^10.0"] + php: ['8.1', '8.2'] + laravel: ['11.0', ^9.0, ^10.0] include: - - laravel: "^9.0" - testbench: "^7.0" - - laravel: "^10.0" - testbench: "^8.0" + - laravel: ^9.0 + testbench: ^7.0 + - laravel: ^10.0 + testbench: ^8.0 + - laravel: '11.0' + testbench: ^9.0 + exclude: + - laravel: '11.0' + php: '8.1' + name: Laravel ${{ matrix.laravel }} PHP${{ matrix.php }} on ${{ matrix.os }} + container: image: lorisleiva/laravel-docker:${{ matrix.php }} + steps: - name: Checkout code uses: actions/checkout@v2 + - name: Validate composer files run: composer validate + - name: Cache dependencies uses: actions/cache@v1 with: path: /composer/cache/files key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} + - name: Install dependencies run: | composer require --prefer-dist --no-progress --no-suggest --no-interaction "illuminate/support:${{ matrix.laravel }}" composer install --prefer-dist --no-progress --no-suggest --no-interaction + - name: Run tests run: phpunit From 05f4b0ac82b3e51a5c32254958bd49057eb58c2a Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Wed, 13 Mar 2024 12:56:54 +0000 Subject: [PATCH 3/4] wip --- .github/workflows/tests.yml | 16 +++++++--------- composer.json | 6 +++--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e60b41b..abc4f0a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,18 +12,16 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - php: ['8.1', '8.2'] - laravel: ['11.0', ^9.0, ^10.0] + php: ["8.1", "8.2", "8.3"] + laravel: [^10.0, ^11.0] include: - - laravel: ^9.0 - testbench: ^7.0 - laravel: ^10.0 testbench: ^8.0 - - laravel: '11.0' + - laravel: ^11.0 testbench: ^9.0 exclude: - - laravel: '11.0' - php: '8.1' + - laravel: ^11.0 + php: "8.1" name: Laravel ${{ matrix.laravel }} PHP${{ matrix.php }} on ${{ matrix.os }} @@ -32,13 +30,13 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Validate composer files run: composer validate - name: Cache dependencies - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: /composer/cache/files key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} diff --git a/composer.json b/composer.json index a8d4070..d376f58 100644 --- a/composer.json +++ b/composer.json @@ -11,13 +11,13 @@ ], "require": { "php": "^8.1", - "illuminate/support": "^9.0|^10.0|^11.0", + "illuminate/support": "^10.0|^11.0", "hoa/compiler": "^3.17", "sanmai/hoa-protocol": "^1.17" }, "require-dev": { - "phpunit/phpunit": "^9.0|^10.5", - "orchestra/testbench": "^7.0|^8.0|^9.0" + "orchestra/testbench": "^9.0", + "phpunit/phpunit": "^9.0|^10.5" }, "autoload": { "psr-4": { From 02def61fba4eb0c03618242969eeb25b2952aac5 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Wed, 13 Mar 2024 13:00:56 +0000 Subject: [PATCH 4/4] wip --- .github/workflows/tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index abc4f0a..21d9946 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,6 +14,7 @@ jobs: os: [ubuntu-latest] php: ["8.1", "8.2", "8.3"] laravel: [^10.0, ^11.0] + dependency-version: [prefer-lowest, prefer-stable] include: - laravel: ^10.0 testbench: ^8.0 @@ -43,8 +44,8 @@ jobs: - name: Install dependencies run: | - composer require --prefer-dist --no-progress --no-suggest --no-interaction "illuminate/support:${{ matrix.laravel }}" - composer install --prefer-dist --no-progress --no-suggest --no-interaction + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Run tests run: phpunit