Skip to content

Commit

Permalink
use set -e in the standard travis script and switch to multi-line
Browse files Browse the repository at this point in the history
  • Loading branch information
reaperhulk authored and dlemstra committed Jan 16, 2018
1 parent f0b421b commit 8468717
Showing 1 changed file with 21 additions and 19 deletions.
40 changes: 21 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,27 @@ 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 --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/
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
Expand Down

0 comments on commit 8468717

Please sign in to comment.