From 051bcb62c6d151e76d223c2a6b5e8021e0b1fa4d Mon Sep 17 00:00:00 2001 From: probonopd Date: Thu, 3 Jan 2019 10:54:43 +0000 Subject: [PATCH 1/2] Fix #336 --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 171aead..0f955b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,13 @@ language: c++ install: - sudo add-apt-repository -y ppa:beineri/opt-qt58-trusty - - sudo apt-get update + - sudo apt-get update -qq - sudo apt-get -y install build-essential qt58declarative qt58graphicaleffects qt58quickcontrols libgl1-mesa-dev + - source /opt/qt*/bin/qt*-env.sh script: - - source /opt/qt58/bin/qt58-env.sh - - qmake - - make -j2 + - qmake CONFIG+=release PREFIX=/usr + - make -j$(nproc) - mkdir -p appdir/usr/share/appdata appdir/usr/bin - cp packaging/appdata/cool-retro-term.appdata.xml appdir/usr/share/appdata/ - cp cool-retro-term appdir/usr/bin/ @@ -20,6 +20,8 @@ script: - cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - 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) # linuxdeployqt uses this for naming the file - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ # -verbose=3 2>&1 | grep "path:" -C 3 - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -verbose=2 -appimage From 3fbfb774301c7cce23e63571c0856132da88863a Mon Sep 17 00:00:00 2001 From: probonopd Date: Thu, 3 Jan 2019 11:04:35 +0000 Subject: [PATCH 2/2] Upload to GitHub Releases Need to set a GITHUB_TOKEN environment variable in https://travis-ci.org/Swordfish90/cool-retro-term/settings --- .travis.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f955b8..9a3259c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,13 @@ script: - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ # -verbose=3 2>&1 | grep "path:" -C 3 - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -verbose=2 -appimage -# See https://github.com/probonopd/uploadtool/ for a way to upload to GitHub Releases automatically after_success: - - curl --upload-file ./Cool_Retro_Term-*.AppImage https://transfer.sh/Cool_Retro_Term-git.$(git rev-parse --short HEAD)-x86_64.AppImage + - find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq + - # curl --upload-file Cool*.AppImage https://transfer.sh/Cool_Retro_Term-git.$(git rev-parse --short HEAD)-x86_64.AppImage + - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh + - bash upload.sh Cool*.AppImage* + +branches: + except: + - # Do not build tags that we create when we upload to GitHub Releases + - /^(?i:continuous)/