From b0bbe42aaa02e82a98108017bb961b685c645e13 Mon Sep 17 00:00:00 2001 From: George Buckingham Date: Mon, 21 Feb 2022 14:43:04 +0000 Subject: [PATCH 1/8] Bump dependencies to add Laravel 9 support --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index f772369..0504647 100644 --- a/composer.json +++ b/composer.json @@ -22,12 +22,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "illuminate/contracts": "^7.0 || ^8.0", - "illuminate/database": "^7.0 || ^8.0", - "illuminate/support": "^7.0 || ^8.0" + "illuminate/contracts": "^7.0 || ^8.0 || ^9.0", + "illuminate/database": "^7.0 || ^8.0 || ^9.0", + "illuminate/support": "^7.0 || ^8.0 || ^9.0" }, "require-dev": { - "orchestra/testbench": "^5.0 || ^6.0", + "orchestra/testbench": "^5.0 || ^6.0 || ^7.0", "phpunit/phpunit": "^9.3" }, "autoload": { From 70343f714c6b2aa420450327bfdead0373e00a57 Mon Sep 17 00:00:00 2001 From: George Buckingham Date: Wed, 23 Feb 2022 09:11:33 +0000 Subject: [PATCH 2/8] Run tests on Laravel 9 & PHP 8.1. --- .github/workflows/run-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 9285eba..bb41176 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -19,10 +19,12 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.0, 7.4] - laravel: [8.*, 7.*] + php: [8.1, 8.0, 7.4] + laravel: [9.*, 8.*, 7.*] dependency-version: [prefer-lowest, prefer-stable] include: + - laravel: 9.* + testbench: 7.* - laravel: 8.* testbench: 6.* - laravel: 7.* From 2f8bee329387c17a474deb61eda7bdf1b4e515a7 Mon Sep 17 00:00:00 2001 From: Travis Elkins Date: Wed, 23 Feb 2022 13:23:38 +0100 Subject: [PATCH 3/8] Excluding L9/PHP7.4 tests. --- .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 bb41176..4c8b2e4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -29,6 +29,9 @@ jobs: testbench: 6.* - laravel: 7.* testbench: 5.* + exclude: + - laravel: 9.* + php: 7.4 steps: - name: Checkout code uses: actions/checkout@v2 From c3f7ba1bda7628f54eae2e4cee44e8fbaf17f9a0 Mon Sep 17 00:00:00 2001 From: Travis Elkins Date: Wed, 23 Feb 2022 14:58:53 +0100 Subject: [PATCH 4/8] Dropping support for L7. --- .github/workflows/run-tests.yml | 4 ++-- composer.json | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 4c8b2e4..4e50972 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: test: - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} + name: L${{ matrix.laravel }} - PHP${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} runs-on: ${{ matrix.os }} services: mysql: @@ -20,7 +20,7 @@ jobs: matrix: os: [ubuntu-latest] php: [8.1, 8.0, 7.4] - laravel: [9.*, 8.*, 7.*] + laravel: [9.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] include: - laravel: 9.* diff --git a/composer.json b/composer.json index 0504647..696bf9e 100644 --- a/composer.json +++ b/composer.json @@ -21,13 +21,13 @@ } ], "require": { - "php": "^7.4 || ^8.0", - "illuminate/contracts": "^7.0 || ^8.0 || ^9.0", - "illuminate/database": "^7.0 || ^8.0 || ^9.0", - "illuminate/support": "^7.0 || ^8.0 || ^9.0" + "php": "^7.4|^8.0", + "illuminate/contracts": "^8.0|^9.0", + "illuminate/database": "^8.0|^9.0", + "illuminate/support": "^8.0|^9.0" }, "require-dev": { - "orchestra/testbench": "^5.0 || ^6.0 || ^7.0", + "orchestra/testbench": "^6.0|^7.0", "phpunit/phpunit": "^9.3" }, "autoload": { From ddec36d2b7b07b9398a4afcc594532bf90c80732 Mon Sep 17 00:00:00 2001 From: Travis Elkins Date: Wed, 23 Feb 2022 15:28:12 +0100 Subject: [PATCH 5/8] Troubleshooting test config error. --- .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 4e50972..5119b5f 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: test: - name: L${{ matrix.laravel }} - PHP${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} + name: L${{ matrix.laravel }} - P${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} runs-on: ${{ matrix.os }} services: mysql: From c5e92ed4de1161b1589b703ed1a6b2f59389d189 Mon Sep 17 00:00:00 2001 From: Travis Elkins Date: Wed, 23 Feb 2022 15:37:08 +0100 Subject: [PATCH 6/8] Troubleshooting test config error, take 2. --- .github/workflows/run-tests.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 5119b5f..3c85585 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -4,8 +4,9 @@ on: [push, pull_request] jobs: test: - name: L${{ matrix.laravel }} - P${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} - runs-on: ${{ matrix.os }} + name: L${{ matrix.laravel }} - PHP${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} + # runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest services: mysql: image: mysql:8.0 @@ -18,7 +19,7 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-latest] + # os: [ubuntu-latest] php: [8.1, 8.0, 7.4] laravel: [9.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] From 05709157be52cb659b615234f1dd6914ca753771 Mon Sep 17 00:00:00 2001 From: Travis Elkins Date: Wed, 23 Feb 2022 15:41:46 +0100 Subject: [PATCH 7/8] Excluding L8/PHP8.1/prefer-lowest. --- .github/workflows/run-tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 3c85585..b2ae1ff 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: true matrix: - # os: [ubuntu-latest] + os: [ubuntu-latest] php: [8.1, 8.0, 7.4] laravel: [9.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] @@ -33,6 +33,9 @@ jobs: exclude: - laravel: 9.* php: 7.4 + - laravel: 8.* + php: 8.1 + dependency-version: prefer-lowest steps: - name: Checkout code uses: actions/checkout@v2 From caa90800c4372b7e1d2790043c98dd153560ca12 Mon Sep 17 00:00:00 2001 From: Travis Elkins Date: Wed, 23 Feb 2022 15:42:44 +0100 Subject: [PATCH 8/8] Removed L7 remnant. --- .github/workflows/run-tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b2ae1ff..1d41819 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -28,8 +28,6 @@ jobs: testbench: 7.* - laravel: 8.* testbench: 6.* - - laravel: 7.* - testbench: 5.* exclude: - laravel: 9.* php: 7.4