X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=.travis.yml;h=db7e77f4fb96d26f0b0af4b4804303bc2aabacc3;hb=dd542160079512e4b9d9f81f08d505d53ed8af03;hp=f908b06a940887026a43c72f60d1fbc136ae10be;hpb=a1ad34061c5a22e667d9916deed0edcdcc8c165f;p=imagemagick

diff --git a/.travis.yml b/.travis.yml
index f908b06a9..db7e77f4f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,34 +15,29 @@ before_script:
   - sudo apt-get install --only-upgrade autoconf
   - sudo apt-get install -y libraqm-dev libfreetype6-dev libharfbuzz-dev libfribidi-dev
 
-script:
-  - export OMP_NUM_THREADS=1
-  - export CFLAGS="-Wno-deprecated-declarations -Wdeclaration-after-statement -Wno-error=unused-variable"
-  - ./configure --enable-zero-configuration --disable-openmp --with-quantum-depth=16 --enable-hdri=no --without-perl --prefix=/usr
-  - make -j$(nproc)
-  - # Generate AppImage
-  - make install DESTDIR=$(readlink -f appdir) ; find appdir/
-  - mkdir -p appdir/usr/share/applications/ ; cp imagemagick.desktop appdir/usr/share/applications/
-  - mkdir -p appdir/usr/share/icons/hicolor/128x128/apps/ ; touch appdir/usr/share/icons/hicolor/128x128/apps/imagemagick.png # FIXME
-  - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-  - chmod a+x linuxdeployqt*.AppImage
-  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-  - export VERSION=$(git rev-parse --short HEAD)-$CC
-  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/imagemagick.desktop -bundle-non-qt-libs
-  - ./linuxdeployqt*.AppImage --appimage-extract
-  - rm ./appdir/AppRun ; cp AppRun appdir/ ; chmod a+x ./appdir/AppRun # Replace symlink with custom script
-  - PATH=./squashfs-root/usr/bin:$PATH ./squashfs-root/usr/bin/appimagetool -g ./appdir/
+script: |
+  set -e
+  set -x
+  export OMP_NUM_THREADS=1
+  export CFLAGS="-Wno-deprecated-declarations -Wdeclaration-after-statement -Wno-error=unused-variable"
+  ./configure --disable-openmp --with-quantum-depth=16 --enable-hdri=no --without-perl --prefix=/usr
+  make
+  make install DESTDIR=$(readlink -f appdir)
+  # Build the fuzzers
+  ./.travis/build_fuzzers.sh
+  # Generate AppImage
+  mkdir -p appdir/usr/share/applications/ ; cp imagemagick.desktop appdir/usr/share/applications/
+  mkdir -p appdir/usr/share/icons/hicolor/128x128/apps/ ; touch appdir/usr/share/icons/hicolor/128x128/apps/imagemagick.png # FIXME
+  wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
+  chmod a+x linuxdeployqt*.AppImage
+  unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+  export VERSION=$(git rev-parse --short HEAD)-$CC
+  ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/imagemagick.desktop -bundle-non-qt-libs
+  ./linuxdeployqt*.AppImage --appimage-extract
+  rm ./appdir/AppRun ; cp AppRun appdir/ ; chmod a+x ./appdir/AppRun # Replace symlink with custom script
+  PATH=./squashfs-root/usr/bin:$PATH ./squashfs-root/usr/bin/appimagetool -g ./appdir/
 
 after_success:
   - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
-  - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
-  - bash upload.sh ImageMagick*AppImage*
-  
-branches:
-  except:
-    - # Do not build tags that we create when we upload to GitHub Releases
-    - /^(?i:continuous)$/
-
-#    - cd PerlMagick
-#    - perl Makefile.PL
-#    - make
+  - if [ "$TRAVIS_BRANCH" == "$TRAVIS_TAG" ] ; then wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh ; bash upload.sh ImageMagick*AppImage* ; fi
+  - if [ "$TRAVIS_BRANCH" != "$TRAVIS_TAG" ] ; then curl --upload-file ./ImageMagick*.AppImage https://transfer.sh/ImageMagick-git.$(git rev-parse --short HEAD)-x86_64.AppImage ; fi