From 478ce649ae465040be797e5c03195969e7aea811 Mon Sep 17 00:00:00 2001 From: freek Date: Thu, 13 Jan 2022 09:46:21 +0100 Subject: [PATCH] wip --- .github/workflows/run-tests.yml | 12 ++++-------- composer.json | 6 +++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 64ab2d1..2e87e82 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,9 +10,11 @@ jobs: matrix: os: [ubuntu-latest] php: [8.1, 8.0] - laravel: [8.*] + laravel: [9.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] include: + - laravel: 9.* + testbench: 7.* - laravel: 8.* testbench: ^6.23 @@ -22,12 +24,6 @@ jobs: - name: Checkout code uses: actions/checkout@v1 - - 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: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -38,7 +34,7 @@ jobs: - name: Install dependencies run: | composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Execute tests run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index f53ec46..8881a55 100644 --- a/composer.json +++ b/composer.json @@ -18,13 +18,13 @@ "require": { "php": "^8.0", "illuminate/auth": "^8.0", - "illuminate/contracts": "^8.71", - "illuminate/support": "^8.71", + "illuminate/contracts": "^8.71|^9.0", + "illuminate/support": "^8.71|^9.0", "spatie/menu": "^3.0" }, "require-dev": { "fakerphp/faker": "^1.9", - "orchestra/testbench": "^6.23", + "orchestra/testbench": "^6.23|^7.0", "phpunit/phpunit": "^9.4" }, "autoload": {