From 2fc473a5b06f2f2b7102433cd9538bbd2a4352b6 Mon Sep 17 00:00:00 2001 From: Aidan Casey Date: Wed, 19 Jan 2022 17:09:00 -0500 Subject: [PATCH] Updates workflows --- .github/workflows/tests.yml | 7 ++++++- composer.json | 2 +- monorepo-builder.php | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2fbacc4..70ccfe9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.0, 8.1] + php: [7.4, 8.0, 8.1] laravel: [8.*, 9.*] dependency-version: [prefer-lowest, prefer-stable] include: @@ -18,6 +18,9 @@ jobs: testbench: 6.* - laravel: 9.* testbench: 7.* + exclude: + - laravel: 9.* + php: 7.4 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} steps: - uses: actions/checkout@v2 @@ -36,5 +39,7 @@ jobs: 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 + - name: Valdidate Dependencies are consistent + run: vendor/bin/monorepo-builder validate - name: Execute tests run: vendor/bin/phpunit --verbose \ No newline at end of file diff --git a/composer.json b/composer.json index 6e6fe3c..9176086 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "require": { "akaunting/laravel-money": "^1.2", "ext-pdo_sqlite": "*", - "illuminate/contracts": "^9.0", + "illuminate/contracts": "^8.0|^9.0", "illuminate/database": "^8.40|^9.0", "illuminate/support": "^8.0|^9.0", "php": "^8.0" diff --git a/monorepo-builder.php b/monorepo-builder.php index 3dc9ad8..8ad4ab6 100644 --- a/monorepo-builder.php +++ b/monorepo-builder.php @@ -20,10 +20,12 @@ ], ], 'require-dev' => [ - 'orchestra/testbench' => '^6.2', + 'orchestra/testbench' => '^6.2|^7.0', 'phpunit/phpunit' => '^9.4', 'symplify/monorepo-builder' => '^9.0', ], + 'minimum-stability' => 'dev', + 'prefer-stable' => true ]); $parameters->set(Option::DATA_TO_REMOVE, [