Skip to content

Commit

Permalink
[5.5] Fixed Travis (laravel#20856)
Browse files Browse the repository at this point in the history
* Upgraded mockery

* Fixed travis file
  • Loading branch information
GrahamCampbell authored and taylorotwell committed Aug 30, 2017
1 parent 7e8a6e5 commit 4c01c44
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
19 changes: 6 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,21 @@
language: php

php:
- 7.0.21
- 7.1
- 7.2

env:
global:
- setup=basic
- setup=stable

matrix:
allow_failures:
- php: 7.2
fast_finish: true
include:
- php: 7.0.21
env: setup=lowest
- php: 7.0.21
env: setup=stable
- php: 7.1
env: setup=lowest
- php: 7.1
env: setup=stable
- php: 7.1
env: setup=lowest
- php: 7.2
- php: 7.2
env: setup=lowest

sudo: false

Expand All @@ -40,7 +34,6 @@ before_install:
- travis_retry composer self-update

install:
- if [[ $setup = 'basic' ]]; then travis_retry composer install --no-interaction --prefer-dist --no-suggest; fi
- if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable --no-suggest; fi
- if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable --no-suggest; fi

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"aws/aws-sdk-php": "~3.0",
"doctrine/dbal": "~2.5",
"filp/whoops": "^2.1.4",
"mockery/mockery": "~0.9.4",
"mockery/mockery": "~1.0",
"orchestra/testbench-core": "3.5.*",
"pda/pheanstalk": "~3.0",
"phpunit/phpunit": "~6.0",
Expand Down

0 comments on commit 4c01c44

Please sign in to comment.