From e633de21705a755d02d84e7f7b19c5186131f91e Mon Sep 17 00:00:00 2001 From: Ed Grosvenor Date: Tue, 19 Mar 2024 14:25:56 +0100 Subject: [PATCH 01/20] Laravel 11 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 1db276d..d1aeb99 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": "^8.1", "spatie/laravel-package-tools": "^1.14.0", - "illuminate/contracts": "^10.0" + "illuminate/contracts": "^10.0|^11.0" }, "require-dev": { "laravel/pint": "^1.0", @@ -68,4 +68,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} \ No newline at end of file +} From 4ebaba392dba0b7a1d5f467c19926fc45488e550 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 11:07:00 -0700 Subject: [PATCH 02/20] add php8.3, L11 to testing matrix --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 57152e1..ba2ab3a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,8 +13,8 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.2, 8.1] - laravel: [10.*] + php: [8.3, 8.2, 8.1] + laravel: [11.*, 10.*] stability: [prefer-lowest, prefer-stable] include: - laravel: 10.* From 19eff50e330021d4aff8b2712be5226f5bd94426 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 11:11:27 -0700 Subject: [PATCH 03/20] include testbench in L11 setup --- .github/workflows/run-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ba2ab3a..cbd4600 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,6 +17,9 @@ jobs: laravel: [11.*, 10.*] stability: [prefer-lowest, prefer-stable] include: + - laravel: 11.* + testbench: 9.* + carbon: ^2.63 - laravel: 10.* testbench: 8.* carbon: ^2.63 From bf1e8f865e688aad010ebc05e663544277f1bc64 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 12:20:11 -0700 Subject: [PATCH 04/20] composer update --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d1aeb99..3804b12 100644 --- a/composer.json +++ b/composer.json @@ -21,10 +21,10 @@ "illuminate/contracts": "^10.0|^11.0" }, "require-dev": { + "larastan/larastan": "^2.9", "laravel/pint": "^1.0", "nunomaduro/collision": "^7.9", - "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^8.0", + "orchestra/testbench": "^8.0|^9.0", "pestphp/pest": "^2.0", "pestphp/pest-plugin-arch": "^2.0", "pestphp/pest-plugin-laravel": "^2.0", From 0eb7b59f950b3ccda329ff9263adff736396ff93 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 12:39:05 -0700 Subject: [PATCH 05/20] update collision --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3804b12..e6457bc 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "require-dev": { "larastan/larastan": "^2.9", "laravel/pint": "^1.0", - "nunomaduro/collision": "^7.9", + "nunomaduro/collision": "^8.0", "orchestra/testbench": "^8.0|^9.0", "pestphp/pest": "^2.0", "pestphp/pest-plugin-arch": "^2.0", From a63d1474481ba8f0b3316eb462714a1d17cc3a4f Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 12:44:42 -0700 Subject: [PATCH 06/20] try again --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index cbd4600..e2edcc4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,7 +20,7 @@ jobs: - laravel: 11.* testbench: 9.* carbon: ^2.63 - - laravel: 10.* + - laravel: ^10.0 testbench: 8.* carbon: ^2.63 From 592911780b1a9d97d94df8580a778b2de8aecc93 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 13:13:57 -0700 Subject: [PATCH 07/20] Revert "try again" This reverts commit a63d1474481ba8f0b3316eb462714a1d17cc3a4f. --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index e2edcc4..cbd4600 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,7 +20,7 @@ jobs: - laravel: 11.* testbench: 9.* carbon: ^2.63 - - laravel: ^10.0 + - laravel: 10.* testbench: 8.* carbon: ^2.63 From 32e8c017c795761a504f083d9cc156109a112dfd Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 13:16:33 -0700 Subject: [PATCH 08/20] fix collision dep for L10 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e6457bc..4f5b833 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "require-dev": { "larastan/larastan": "^2.9", "laravel/pint": "^1.0", - "nunomaduro/collision": "^8.0", + "nunomaduro/collision": "^7.0|^8.0", "orchestra/testbench": "^8.0|^9.0", "pestphp/pest": "^2.0", "pestphp/pest-plugin-arch": "^2.0", From 2cbeff7ee7966ce8b5dc58f42d37307cd5e73e9c Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 13:26:01 -0700 Subject: [PATCH 09/20] exclude P8.1 L11 from matix --- .github/workflows/run-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index cbd4600..8dfb19e 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -23,6 +23,9 @@ jobs: - laravel: 10.* testbench: 8.* carbon: ^2.63 + exclude: + - laravel: 11.* + php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 3b94c18b5180f0760440ab55c564183e6965e908 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 13:30:39 -0700 Subject: [PATCH 10/20] adds macos to testing matrix --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8dfb19e..482a00f 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-latest, windows-latest] + os: [macos-latest, ubuntu-latest, windows-latest] php: [8.3, 8.2, 8.1] laravel: [11.*, 10.*] stability: [prefer-lowest, prefer-stable] From 0065c965fb4280a6b1d3d2af506bbd18d3d98997 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 13:40:35 -0700 Subject: [PATCH 11/20] temporarily remove fail-fast --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 482a00f..3038797 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,7 +10,7 @@ jobs: test: runs-on: ${{ matrix.os }} strategy: - fail-fast: true + # fail-fast: true matrix: os: [macos-latest, ubuntu-latest, windows-latest] php: [8.3, 8.2, 8.1] From 96608a3b3f9d5cbee12a57ff38b4761af861d571 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 14:02:54 -0700 Subject: [PATCH 12/20] set minimum testbench version in L10 test matrix --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 3038797..f7a137b 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -21,7 +21,7 @@ jobs: testbench: 9.* carbon: ^2.63 - laravel: 10.* - testbench: 8.* + testbench: ^8.11 carbon: ^2.63 exclude: - laravel: 11.* From 4cb02c5384406c66095431b839ca49cff1145b98 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 14:10:12 -0700 Subject: [PATCH 13/20] add lowest valid canvas package version to test matrix --- .github/workflows/run-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f7a137b..3546ed1 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -19,9 +19,11 @@ jobs: include: - laravel: 11.* testbench: 9.* + canvas: ^8.11 carbon: ^2.63 - laravel: 10.* testbench: ^8.11 + canvas: ^8.11 carbon: ^2.63 exclude: - laravel: 11.* @@ -47,7 +49,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "orchestra/canvas:${{ matrix.canvas }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: List Installed Dependencies From e827c5b018e0dbd77e2a97ad935890a9185ceda4 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 14:11:37 -0700 Subject: [PATCH 14/20] fix canvas version for L11 --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 3546ed1..813cbd2 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -19,7 +19,7 @@ jobs: include: - laravel: 11.* testbench: 9.* - canvas: ^8.11 + canvas: 9.* carbon: ^2.63 - laravel: 10.* testbench: ^8.11 From e62a053b6e5aff27ccd4436c283e8541d1b7e1df Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 14:23:34 -0700 Subject: [PATCH 15/20] bump minimum carbon version for test matrix --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 813cbd2..178b156 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,11 +20,11 @@ jobs: - laravel: 11.* testbench: 9.* canvas: 9.* - carbon: ^2.63 + carbon: ^2.67 - laravel: 10.* testbench: ^8.11 canvas: ^8.11 - carbon: ^2.63 + carbon: ^2.67 exclude: - laravel: 11.* php: 8.1 From 09830814074deaa92ddd4eb85e6182626f8f11cf Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 14:35:42 -0700 Subject: [PATCH 16/20] try again --- .github/workflows/run-tests.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 178b156..d904383 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -18,11 +18,9 @@ jobs: stability: [prefer-lowest, prefer-stable] include: - laravel: 11.* - testbench: 9.* canvas: 9.* carbon: ^2.67 - laravel: 10.* - testbench: ^8.11 canvas: ^8.11 carbon: ^2.67 exclude: @@ -49,7 +47,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "orchestra/canvas:${{ matrix.canvas }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/canvas:${{ matrix.canvas }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: List Installed Dependencies From e9eb2d1ab1a6f008773b76a6e2060410704267b3 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 14:42:51 -0700 Subject: [PATCH 17/20] update carbon version for testing matrix --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index d904383..00d2d96 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -19,10 +19,10 @@ jobs: include: - laravel: 11.* canvas: 9.* - carbon: ^2.67 + carbon: 2.* - laravel: 10.* canvas: ^8.11 - carbon: ^2.67 + carbon: 2.* exclude: - laravel: 11.* php: 8.1 From e854ed3b2d4351d3ea8472aff89c964775e1ae77 Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 14:48:06 -0700 Subject: [PATCH 18/20] update actions/checkout to v4 (node16->20) --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 00d2d96..6fbfac2 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 From 0eaaca60d659b13991497998715cdca4c508abae Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 14:56:53 -0700 Subject: [PATCH 19/20] re-enable fail-fast feature in CI --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 6fbfac2..5cbbc4c 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,7 +10,7 @@ jobs: test: runs-on: ${{ matrix.os }} strategy: - # fail-fast: true + fail-fast: true matrix: os: [macos-latest, ubuntu-latest, windows-latest] php: [8.3, 8.2, 8.1] From cdb5e441b9b1a6f87f3bde962a9f65305b8ed77a Mon Sep 17 00:00:00 2001 From: Len Woodward Date: Tue, 19 Mar 2024 14:57:49 -0700 Subject: [PATCH 20/20] add missing version constraint --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4f5b833..a53ad96 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "larastan/larastan": "^2.9", "laravel/pint": "^1.0", "nunomaduro/collision": "^7.0|^8.0", - "orchestra/testbench": "^8.0|^9.0", + "orchestra/testbench": "^8.11|^9.0", "pestphp/pest": "^2.0", "pestphp/pest-plugin-arch": "^2.0", "pestphp/pest-plugin-laravel": "^2.0",