From 6ae2091eb2714cad7f4e2a9c46c33bb494be7a3e Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sun, 4 Dec 2016 11:24:17 +0100
Subject: [PATCH] Use continuous build of linuxdeployqt and upload to GitHub
 Releases

---
 .travis.yml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 23a7c53..0e6ab08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,17 +7,14 @@ os: linux
 before_install:
   - sudo add-apt-repository --yes ppa:beineri/opt-qt57-trusty
   - sudo apt-get update -qq
-  - wget https://nixos.org/releases/patchelf/patchelf-0.9/patchelf-0.9.tar.bz2
-  - tar xf patchelf-0.9.tar.bz2
-  - cd patchelf-*/ 
+  - git clone https://github.com/NixOS/patchelf.git
+  - cd patchelf
+  - bash ./bootstrap.sh
   - ./configure
-  - make -j2
+  - make -j7
   - sudo make install
   - cd -
-  - ID=$(wget -q https://api.travis-ci.org/repos/probonopd/appimagetool/builds -O - | head -n 1 | sed -e 's|}|\n|g' | grep '"result":0' | head -n 1 | sed -e 's|,|\n|g' | grep '"id"' | cut -d ":" -f 2)
-  - URL=$(wget -q "http://archive.travis-ci.org/jobs/$((ID+1))/log.txt" -O - | grep -o "https://transfer.sh/.*/appimagetool" | tail -n 1 | sed -e 's|\r||g')
-  - if [ -z "$URL" ] ; then URL=$(wget -q "http://archive.travis-ci.org/jobs/$((ID+2))/log.txt" -O - | grep -o "https://transfer.sh/.*/appimagetool" | tail -n 1 | sed -e 's|\r||g') ; fi
-  - sudo wget -c "$URL" -O /usr/local/bin/appimagetool
+  - sudo wget -c "https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" -O /usr/local/bin/appimagetool
   - sudo chmod a+x /usr/local/bin/appimagetool
   
 install:
@@ -30,8 +27,15 @@ script:
   - mkdir -p linuxdeployqt.AppDir/usr/bin/
   - cp /usr/local/bin/patchelf linuxdeployqt.AppDir/usr/bin/
   - cp /usr/local/bin/appimagetool linuxdeployqt.AppDir/usr/bin/
-  - cp ./linuxdeployqt/linuxdeployqt linuxdeployqt.AppDir/linuxdeployqt
-  - export VERSION=$(git describe --always)
-  - ./linuxdeployqt/linuxdeployqt linuxdeployqt.AppDir/linuxdeployqt -verbose=3 -appimage
+  - cp ./linuxdeployqt/linuxdeployqt linuxdeployqt.AppDir/usr/bin/linuxdeployqt
+  - find linuxdeployqt.AppDir/
+  - export VERSION=continuous
+  - ./linuxdeployqt/linuxdeployqt linuxdeployqt.AppDir/usr/bin/linuxdeployqt -verbose=3 -appimage
   - ls -lh
-  - curl --upload-file ./linuxdeployqt-*.AppImage https://transfer.sh/linuxdeployqt-$VERSION-x86_64.appimage
+  - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+  - bash ./upload.sh ./linuxdeployqt-*.AppImage
+
+branches:
+  except:
+    - # Do not build tags that we create when we upload to GitHub Releases
+    - /^(?i:continuous)$/