From a1afb56e496ba824767cd9d4f4a6294c25ed836f Mon Sep 17 00:00:00 2001 From: Shift Date: Fri, 1 Mar 2024 20:08:12 +0000 Subject: [PATCH 1/2] Bump dependencies for Laravel 11 --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 4ddd225..039c45a 100755 --- a/composer.json +++ b/composer.json @@ -21,17 +21,17 @@ ], "require": { "php": "^8.1|^8.2|^8.3", - "illuminate/contracts": "^10.0", + "illuminate/contracts": "^10.0|^11.0", "php-ffmpeg/php-ffmpeg": "^1.2", "ramsey/collection": "^2.0" }, "require-dev": { "league/flysystem-memory": "^3.10", "mockery/mockery": "^1.4.4", - "nesbot/carbon": "^2.66", - "orchestra/testbench": "^8.0", + "nesbot/carbon": "^2.66|^3.0", + "orchestra/testbench": "^8.0|^9.0", "phpunit/phpunit": "^10.4", - "spatie/image": "^2.2", + "spatie/image": "^2.2|^3.3", "spatie/phpunit-snapshot-assertions": "^5.0" }, "autoload": { @@ -63,4 +63,4 @@ } } } -} \ No newline at end of file +} From b4451e50e9fbf20e345ae3d31c617d98d1162e46 Mon Sep 17 00:00:00 2001 From: Shift Date: Fri, 1 Mar 2024 20:08:12 +0000 Subject: [PATCH 2/2] Update GitHub Actions for Laravel 11 --- .github/workflows/run-tests.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 93a1e10..af84718 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -1,23 +1,31 @@ name: run-tests -on: [push, pull_request] +on: + - push + - pull_request concurrency: ci-${{ github.ref }} jobs: test: runs-on: ${{ matrix.os }} + strategy: fail-fast: true matrix: os: [ubuntu-20.04] php: [8.3, 8.2, 8.1] - laravel: [10.*] + laravel: ['10.*', '11.*'] ffmpeg: [5.0, 4.4] dependency-version: [prefer-lowest, prefer-stable] include: - laravel: 10.* testbench: 8.* + - laravel: 11.* + testbench: 9.* + exclude: + - laravel: 11.* + php: 8.1 name: ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - FF${{ matrix.ffmpeg }} - ${{ matrix.dependency-version }}