Merge branch '3.0'

orchestral · Mar 18, 2015 · b073ab5 · b073ab5
2 parents dec559f + 5947fa2
commit b073ab5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tests/travis/gmagick.sh b/tests/travis/gmagick.sh
@@ -6,5 +6,5 @@ phpize;
 ./configure --with-gmagick=/usr/local;
 make -j;
 sudo make install;
-echo "extension=gmagick.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`;
+echo "extension=gmagick.so"  >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
 php --ri gmagick;
diff --git a/tests/travis/imagick.sh b/tests/travis/imagick.sh
@@ -1,6 +1,6 @@
-wget http://www.imagemagick.org/download/releases/ImageMagick-6.8.9-7.tar.gz;
-tar xzf ImageMagick-6.8.9-7.tar.gz;
-cd ImageMagick-6.8.9-7;
+wget http://www.imagemagick.org/download/ImageMagick-6.9.0-10.tar.gz;
+tar xzf ImageMagick-6.9.0-10.tar.gz;
+cd ImageMagick-6.9.0-10;
 ./configure --prefix=/opt/imagemagick;
 make -j;
 sudo make install;
@@ -14,5 +14,5 @@ phpize;
 ./configure --with-imagick=/opt/imagemagick;
 make -j;
 sudo make install;
-echo "extension=imagick.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`;
+echo "extension=imagick.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
 php --ri imagick;