Skip to content

Commit

Permalink
fix(ci): downgrade mockery when downgrading phpunit because of conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Kocal authored and ondrejmirtes committed May 16, 2021
1 parent e0e52bf commit 2b4acc6
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ jobs:
- name: "Install dependencies"
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Downgrade PHPUnit"
- name: "Downgrade PHPUnit and Mockery"
if: matrix.php-version == '7.1' || matrix.php-version == '7.2' || matrix.php-version == '7.3'
run: "composer require --dev phpunit/phpunit:^7.5.20 --update-with-dependencies"
run: "composer require --dev phpunit/phpunit:^7.5.20 mockery/mockery:^1.3 --update-with-dependencies"

- name: "Lint"
run: "make lint"
Expand Down Expand Up @@ -107,9 +107,9 @@ jobs:
if: ${{ matrix.dependencies == 'highest' }}
run: "composer update --no-interaction --no-progress --no-suggest"

- name: "Downgrade PHPUnit"
- name: "Downgrade PHPUnit and Mockery"
if: matrix.php-version == '7.1' || matrix.php-version == '7.2' || matrix.php-version == '7.3'
run: "composer require --dev phpunit/phpunit:^7.5.20 --update-with-dependencies"
run: "composer require --dev phpunit/phpunit:^7.5.20 mockery/mockery:^1.3 --update-with-dependencies"

- name: "Tests"
run: "make tests"
Expand Down Expand Up @@ -151,9 +151,9 @@ jobs:
if: ${{ matrix.dependencies == 'highest' }}
run: "composer update --no-interaction --no-progress --no-suggest"

- name: "Downgrade PHPUnit"
- name: "Downgrade PHPUnit and Mockery"
if: matrix.php-version == '7.1' || matrix.php-version == '7.2' || matrix.php-version == '7.3'
run: "composer require --dev phpunit/phpunit:^7.5.20 --update-with-dependencies"
run: "composer require --dev phpunit/phpunit:^7.5.20 mockery/mockery:^1.3 --update-with-dependencies"

- name: "PHPStan"
run: "make phpstan"

0 comments on commit 2b4acc6

Please sign in to comment.