From 93ef59ded69c45948890aa8dc70a2a1c86f98313 Mon Sep 17 00:00:00 2001 From: Abhishek Sharma <52767864+TheAbhishekIN@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:05:28 +0530 Subject: [PATCH 1/5] Laravel v11 compitable --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 59e3099..0e52df4 100644 --- a/composer.json +++ b/composer.json @@ -18,19 +18,19 @@ "require": { "php": "^8.1", "spatie/laravel-package-tools": "^1.13.0", - "illuminate/contracts": "^9.0|^10.0" + "illuminate/contracts": "^9.0|^10.0|^11.0" }, "require-dev": { "laravel/pint": "^1.0", - "nunomaduro/collision": "^6.0|^7.0", + "nunomaduro/collision": "^6.0|^7.0|^8.0", "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^7.0|^8.0", + "orchestra/testbench": "^7.0|^8.0|^9.0", "pestphp/pest": "^1.21", "pestphp/pest-plugin-laravel": "^1.1", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^9.5|^10.0" + "phpunit/phpunit": "^9.5|^10.0|^11.0" }, "autoload": { "psr-4": { @@ -68,4 +68,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} \ No newline at end of file +} From c0198ce679a54a77bbe8d249fdb0b18d3536df92 Mon Sep 17 00:00:00 2001 From: ousid Date: Mon, 8 Apr 2024 16:10:17 +0100 Subject: [PATCH 2/5] update `run-tests.yml` --- .github/workflows/run-tests.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b662705..ef65b87 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,17 +13,21 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.1, 8.2] - laravel: [9.*, 10.*] + php: [8.1, 8.2, 8.3] + laravel: [9.*, 10.*, 11.*] stability: [prefer-lowest, prefer-stable] include: - laravel: 9.* testbench: 7.* - laravel: 10.* testbench: 8.* + - laravel: 11.* + testbench: 9.* exclude: - laravel: 9.* php: 8.2 + - laravel: 11.* + php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 54c7dbeb8423485443a86103c5d806f45a557d7b Mon Sep 17 00:00:00 2001 From: Oussama Date: Mon, 8 Apr 2024 16:15:32 +0100 Subject: [PATCH 3/5] Revert "Run Tests CI Updates" --- .github/workflows/run-tests.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ef65b87..b662705 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,21 +13,17 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.1, 8.2, 8.3] - laravel: [9.*, 10.*, 11.*] + php: [8.1, 8.2] + laravel: [9.*, 10.*] stability: [prefer-lowest, prefer-stable] include: - laravel: 9.* testbench: 7.* - laravel: 10.* testbench: 8.* - - laravel: 11.* - testbench: 9.* exclude: - laravel: 9.* php: 8.2 - - laravel: 11.* - php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 0b0e568709e0849c59fa90bf151c929b8c031d86 Mon Sep 17 00:00:00 2001 From: ousid Date: Mon, 8 Apr 2024 16:17:46 +0100 Subject: [PATCH 4/5] update `run-tests.yml` --- .github/workflows/run-tests.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ef65b87..00d157a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -2,9 +2,15 @@ name: run-tests on: push: - branches: [main] + branches: + - main + - 1.x + - 2.x pull_request: - branches: [main] + branches: + - main + - 1.x + - 2.x jobs: test: From bf6b7ea3f8a49eab22b45b0d8c4c0947b3008bbb Mon Sep 17 00:00:00 2001 From: ousid Date: Mon, 8 Apr 2024 16:31:53 +0100 Subject: [PATCH 5/5] update `run-tests.yml` --- .github/workflows/run-tests.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 82cd8ac..07c5f55 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,16 +20,20 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] php: [8.1, 8.2] - laravel: [9.*, 10.*] + laravel: [9.*, 10.*, 11.*] stability: [prefer-lowest, prefer-stable] include: - laravel: 9.* testbench: 7.* - laravel: 10.* testbench: 8.* + - laravel: 11.* + testbench: 9.* exclude: - laravel: 9.* php: 8.2 + - larvel: 11.* + php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}