Skip to content

Commit

Permalink
Fix tests on travis. (yiisoft#13238)
Browse files Browse the repository at this point in the history
  • Loading branch information
rob006 authored and samdark committed Dec 17, 2016
1 parent df733d1 commit 2a68351
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 15 deletions.
16 changes: 1 addition & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,6 @@ matrix:
services:
- mysql
- postgresql
- php: 5.4
addons:
apt:
packages:
- php5.4-gd
- php: 5.5
addons:
apt:
packages:
- php5.5-gd
- php: 5.6
addons:
apt:
packages:
- php5.6-gd
# have a separate branch for javascript tests
- language: node_js
node_js: 6
Expand Down Expand Up @@ -129,6 +114,7 @@ install:
- travis_retry composer update --prefer-dist --no-interaction
- tests/data/travis/apc-setup.sh
- tests/data/travis/memcache-setup.sh
- tests/data/travis/imagick-setup.sh
# - tests/data/travis/cubrid-setup.sh

before_script:
Expand Down
5 changes: 5 additions & 0 deletions tests/data/travis/imagick-setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh -e

if [ $(phpenv version-name) = '5.4' ] || [ $(phpenv version-name) = '5.5' ] || [ $(phpenv version-name) = '5.6' ]; then
yes '' | pecl install imagick
fi

0 comments on commit 2a68351

Please sign in to comment.