Update travis build.

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Feb 13, 2019 · 8ac902d · 8ac902d
1 parent f46790c
commit 8ac902d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 30 deletions.
diff --git a/.travis/gmagick.sh b/.travis/gmagick.sh
@@ -2,45 +2,48 @@
 
 set -xe
 
-GRAPHICSMAGIC_VERSION="1.3.23"
-if [ ${TRAVIS_PHP_VERSION:0:1} = '7' ] || [ $TRAVIS_PHP_VERSION = 'nightly' ]
-then
-  GMAGICK_VERSION="2.0.4RC1"
+GRAPHICSMAGIC_VERSION='1.3.23'
+if [ ${TRAVIS_PHP_VERSION:0:1} = '5' ]; then
+  GMAGICK_VERSION='1.1.7RC2'
 else
-  GMAGICK_VERSION="1.1.7RC2"
+  GMAGICK_VERSION='2.0.4RC1'
 fi
 
+PHP_VERSION=`php -r 'echo PHP_VERSION_ID;'`
+CUSTOM_CFLAGS='-Wno-misleading-indentation -Wno-unused-const-variable -Wno-pointer-compare -Wno-tautological-compare'
+
 mkdir -p cache
 cd cache
 
-if [ ! -e ./GraphicsMagick-$GRAPHICSMAGIC_VERSION ]
-then
+if [ ! -e ./GraphicsMagick-$GRAPHICSMAGIC_VERSION ]; then
+    rm -rf ./GraphicsMagick-* || true
     wget http://78.108.103.11/MIRROR/ftp/GraphicsMagick/1.3/GraphicsMagick-$GRAPHICSMAGIC_VERSION.tar.xz
     tar -xf GraphicsMagick-$GRAPHICSMAGIC_VERSION.tar.xz
     rm GraphicsMagick-$GRAPHICSMAGIC_VERSION.tar.xz
     cd GraphicsMagick-$GRAPHICSMAGIC_VERSION
-    ./configure --prefix=/opt/gmagick --enable-shared --with-lcms2
-    make -j
+    CFLAGS="${CFLAGS:-} ${CUSTOM_CFLAGS:-}" ./configure --prefix=/opt/gmagick --enable-shared --with-lcms2
+    make -j V=0
 else
     cd GraphicsMagick-$GRAPHICSMAGIC_VERSION
 fi
 
 sudo make install
 cd ..
 
-if [ ! -e ./gmagick-$GMAGICK_VERSION ]
-then
+if [ ! -e ./gmagick-$GMAGICK_VERSION-$PHP_VERSION-$GRAPHICSMAGIC_VERSION ]; then
+    rm -rf ./gmagick-* || true
     wget https://pecl.php.net/get/gmagick-$GMAGICK_VERSION.tgz
     tar -xzf gmagick-$GMAGICK_VERSION.tgz
     rm gmagick-$GMAGICK_VERSION.tgz
-    cd gmagick-$GMAGICK_VERSION
+    mv gmagick-$GMAGICK_VERSION gmagick-$GMAGICK_VERSION-$PHP_VERSION-$GRAPHICSMAGIC_VERSION
+    cd gmagick-$GMAGICK_VERSION-$PHP_VERSION-$GRAPHICSMAGIC_VERSION
     phpize
-    ./configure --with-gmagick=/opt/gmagick
-    make -j
+    CFLAGS="${CFLAGS:-} ${CUSTOM_CFLAGS:-}" ./configure --with-gmagick=/opt/gmagick
+    make -j V=0
 else
-    cd gmagick-$GMAGICK_VERSION
+    cd gmagick-$GMAGICK_VERSION-$PHP_VERSION-$GRAPHICSMAGIC_VERSION
 fi
 
 sudo make install
-echo "extension=gmagick.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+echo 'extension=gmagick.so' >> `php --ini | grep 'Loaded Configuration' | sed -e 's|.*:\s*||'`
 php --ri gmagick
diff --git a/.travis/imagick.sh b/.travis/imagick.sh
@@ -2,42 +2,50 @@
 
 set -xe
 
-IMAGEMAGICK_VERSION="6.8.9-10"
-IMAGICK_VERSION="3.4.3"
+IMAGEMAGICK_VERSION='6.8.9-10'
+IMAGICK_VERSION='3.4.3'
+
+IMAGEMAGICK_MAJORVERSION=`printf %s "$IMAGEMAGICK_VERSION" | cut -f1 -d'.'`
+PHP_VERSION=`php -r 'echo PHP_VERSION_ID;'`
+CUSTOM_CFLAGS='-Wno-deprecated-declarations -Wno-misleading-indentation -Wno-nonnull-compare -Wno-tautological-compare -Wno-unused-but-set-variable'
 
 mkdir -p cache
 cd cache
 
-if [ ! -e ./ImageMagick-$IMAGEMAGICK_VERSION ]
-then
+if [ ! -e ./ImageMagick-$IMAGEMAGICK_VERSION ]; then
+    rm -rf ./ImageMagick-* || true
     wget http://www.imagemagick.org/download/releases/ImageMagick-$IMAGEMAGICK_VERSION.tar.xz
     tar -xf ImageMagick-$IMAGEMAGICK_VERSION.tar.xz
     rm ImageMagick-$IMAGEMAGICK_VERSION.tar.xz
     cd ImageMagick-$IMAGEMAGICK_VERSION
-    ./configure --prefix=/opt/imagemagick
-    make -j
+    CFLAGS="${CFLAGS:-} ${CUSTOM_CFLAGS:-}" ./configure --disable-docs --prefix=/opt/imagemagick
+    make -j V=0
 else
     cd ImageMagick-$IMAGEMAGICK_VERSION
 fi
 
 sudo make install
 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/imagemagick/lib/pkgconfig
-sudo ln -s /opt/imagemagick/include/ImageMagick-6 /opt/imagemagick/include/ImageMagick
+if [ -L /opt/imagemagick/include/ImageMagick ]; then
+    sudo unlink /opt/imagemagick/include/ImageMagick
+fi
+sudo ln -s /opt/imagemagick/include/ImageMagick-$IMAGEMAGICK_MAJORVERSION /opt/imagemagick/include/ImageMagick
 cd ..
 
-if [ ! -e ./imagick-$IMAGICK_VERSION ]
-then
+if [ ! -e ./imagick-$IMAGICK_VERSION-$PHP_VERSION-$IMAGEMAGICK_VERSION ]; then
+    rm -rf ./imagick-* || true
     wget https://pecl.php.net/get/imagick-$IMAGICK_VERSION.tgz
     tar -xzf imagick-$IMAGICK_VERSION.tgz
     rm imagick-$IMAGICK_VERSION.tgz
-    cd imagick-$IMAGICK_VERSION
+    mv imagick-$IMAGICK_VERSION imagick-$IMAGICK_VERSION-$PHP_VERSION-$IMAGEMAGICK_VERSION
+    cd imagick-$IMAGICK_VERSION-$PHP_VERSION-$IMAGEMAGICK_VERSION
     phpize
-    ./configure --with-imagick=/opt/imagemagick
-    make -j
+    CFLAGS="${CFLAGS:-} ${CUSTOM_CFLAGS:-}" ./configure --with-imagick=/opt/imagemagick
+    make -j V=0
 else
-    cd imagick-$IMAGICK_VERSION
+    cd imagick-$IMAGICK_VERSION-$PHP_VERSION-$IMAGEMAGICK_VERSION
 fi
 
 sudo make install
-echo "extension=imagick.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+echo 'extension=imagick.so' >> `php --ini | grep 'Loaded Configuration' | sed -e 's|.*:\s*||'`
 php --ri imagick