Skip to content

Commit

Permalink
Fix dependency installation in CI matrix (#2300)
Browse files Browse the repository at this point in the history
  • Loading branch information
spawnia authored Feb 14, 2023
1 parent 66ca8bf commit 1658994
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Autoformat"
name: "Format"
on:
push:
branches:
Expand Down
21 changes: 9 additions & 12 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ jobs:
- name: "Remove conflicting dependencies that are not needed here"
run: composer remove --dev phpbench/phpbench rector/rector --no-update

- name: "Fix https://github.com/BenSampo/laravel-enum/issues/249"
if: matrix.laravel-version == '^9'
run: composer require --dev composer/composer:'dev-main as v2.3.0' --no-install

- run: composer require illuminate/contracts:${{ matrix.laravel-version }} --no-interaction --prefer-dist --no-progress

- run: vendor/bin/phpstan
Expand Down Expand Up @@ -120,15 +116,16 @@ jobs:
- name: "Remove conflicting dependencies that are not needed here"
run: composer remove --dev nunomaduro/larastan phpstan/phpstan-mockery phpbench/phpbench rector/rector --no-update

- name: "Fix https://github.com/BenSampo/laravel-enum/issues/249"
if: matrix.laravel-version == '^9'
run: composer require --dev composer/composer:'dev-main as v2.3.0' --no-install

- run: composer require illuminate/contracts:${{ matrix.laravel-version }} --no-interaction --prefer-dist --no-progress

- run: composer update ${{ matrix.composer.arg }}
- run: >
composer require
illuminate/contracts:${{ matrix.laravel-version }}
--no-interaction
--prefer-dist
--no-progress
--update-with-all-dependencies
${{ matrix.composer.arg }}
- run: vendor/bin/phpunit --colors=always --verbose
- run: vendor/bin/phpunit

coverage:
runs-on: ubuntu-latest
Expand Down

0 comments on commit 1658994

Please sign in to comment.