From fe33f3cf957e4fa3115d31a60e5c766786f3a9de Mon Sep 17 00:00:00 2001 From: Jammyjamjamman Date: Mon, 22 Apr 2019 20:49:40 +0100 Subject: [PATCH] tidy up .travis.yml some more --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9cd077f34..5169904c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,7 +66,6 @@ script: | mkdir build; cd build; cmake .. -DCMAKE_INSTALL_PREFIX=/usr; - fi if [ "$TRAVIS_OS_NAME" = "osx" ]; then mkdir build; @@ -80,11 +79,12 @@ script: | mkdir build; cd build; cmake .. -DFORCE_EMBEDDED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr; - fi + make -j$(nproc) && make install DESTDIR=../Glest; cd ..; rm -rf build; + # Get the data for the appimage build. git clone https://github.com/glest/glest-data.git; mkdir build; cd build; @@ -95,6 +95,7 @@ script: | # Remove useless metainfo. rm Glest/usr/share/metainfo/io.glest.Editor.appdata.xml; find Glest/; + # Build the appimage. export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/pulseaudio/:/usr/lib/i386-linux-gnu/pulseaudio/:$LD_LIBRARY_PATH; wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"; chmod a+x linuxdeployqt-continuous-x86_64.AppImage; @@ -128,6 +129,7 @@ after_success: - ./send.sh success $WEBHOOK_URL after_failure: + # Notify discord. - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh - chmod +x send.sh - ./send.sh failure $WEBHOOK_URL