From 5f2947a01213c28c2f0664d3c61917aca2cd2ddb Mon Sep 17 00:00:00 2001 From: Jeremiasz Major Date: Mon, 26 Dec 2022 23:39:51 +0100 Subject: [PATCH] use correct laravel versions in ci --- .github/workflows/sca.yml | 4 +--- .github/workflows/tests.yml | 4 +--- composer.json | 2 +- composer.lock | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/sca.yml b/.github/workflows/sca.yml index 9f11bdd..18ceca3 100644 --- a/.github/workflows/sca.yml +++ b/.github/workflows/sca.yml @@ -38,9 +38,7 @@ jobs: restore-keys: composer- - name: Install Composer dependencies - run: | - composer require laravel/framework:${{ matrix.laravel }} --no-update - composer update --${{ matrix.stability }} + run: composer update laravel/framework:${{ matrix.laravel }} orchestra/testbench --with-all-dependencies --${{ matrix.stability }} - name: Run PHPStan run: vendor/bin/phpstan analyse --no-progress --no-interaction diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 213c76e..2f7dbe5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,9 +38,7 @@ jobs: restore-keys: composer- - name: Install Composer dependencies - run: | - composer require laravel/framework:${{ matrix.laravel }} --no-update - composer update --${{ matrix.stability }} + run: composer update laravel/framework:${{ matrix.laravel }} orchestra/testbench --with-all-dependencies --${{ matrix.stability }} - name: Execute tests run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index 0871ca0..b63851d 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ }, "require-dev": { "jrmajor/cs": "^0.4.6", - "orchestra/testbench": "^6.25 || ^7.17", + "orchestra/testbench": "^7.0", "phpstan/phpstan": "^1.9", "phpunit/phpunit": "^9.5" }, diff --git a/composer.lock b/composer.lock index 47e3a24..738aaa1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4eb84cd931d38ff12fa4e6cf6e03df93", + "content-hash": "e0ceda943b47e6881e98fbfca56b2fef", "packages": [ { "name": "brick/math",