diff options
| author | Davide Beatrici <davidebeatrici@gmail.com> | 2019-06-10 10:12:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 10:12:36 +0300 |
| commit | 83bca04fa0ff48f3bf81fefed5973a8dbdd33da3 (patch) | |
| tree | 13ba8a202313e358d2371a7f86149a0a9c174d00 | |
| parent | 41502bb8e43f4fa8eb14e27caef18a2d5ac9e571 (diff) | |
| parent | 049f6a242754fd52528c6cac183679aeaa4f4a10 (diff) | |
Merge PR #3703: Generate and upload AppImage
| -rwxr-xr-x | scripts/travis-ci/before_install.bash | 2 | ||||
| -rwxr-xr-x | scripts/travis-ci/script.bash | 17 |
2 files changed, 16 insertions, 3 deletions
diff --git a/scripts/travis-ci/before_install.bash b/scripts/travis-ci/before_install.bash index 789897737..a46eb5ded 100755 --- a/scripts/travis-ci/before_install.bash +++ b/scripts/travis-ci/before_install.bash @@ -22,7 +22,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then sudo apt-get -qq update sudo apt-get build-dep -qq mumble - sudo apt-get install qt5-default qttools5-dev qttools5-dev-tools qtbase5-dev qtbase5-dev-tools qttranslations5-l10n libqt5svg5-dev + sudo apt-get install libqt5sql5 libqt5sql5-sqlite qt5-default qttools5-dev qttools5-dev-tools qtbase5-dev qtbase5-dev-tools qttranslations5-l10n libqt5svg5-dev sudo apt-get install libjack-jackd2-dev elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then sudo dpkg --add-architecture i386 diff --git a/scripts/travis-ci/script.bash b/scripts/travis-ci/script.bash index e1c822249..bfbc7f62b 100755 --- a/scripts/travis-ci/script.bash +++ b/scripts/travis-ci/script.bash @@ -13,11 +13,24 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then fi qmake-qt4 CONFIG+="release tests g15-emulator qt4-legacy-compat ${EXTRA_CONFIG}" -recursive && make -j2 && make check elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then - EXTRA_CONFIG= + EXTRA_CONFIG=PREFIX=/usr if [ "${MUMBLE_NO_PCH}" == "1" ]; then EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}" fi - qmake CONFIG+="release tests g15-emulator ${EXTRA_CONFIG}" -recursive && make -j2 && make check + qmake CONFIG+="release tests g15-emulator ${EXTRA_CONFIG}" DEFINES+="MUMBLE_VERSION=${TRAVIS_COMMIT:0:7}" -recursive && make -j2 && make check + # The next few lines should really be done by "make install"; https://github.com/mumble-voip/mumble/issues/1029 + mkdir -p appdir/usr/bin appdir/usr/lib/mumble appdir/usr/share/metainfo/ appdir/usr/share/icons/scalable/apps/ appdir/usr/share/applications/ + cp release/lib* appdir/usr/lib/ + cp release/mumble appdir/usr/bin + cp release/plugins/lib* appdir/usr/lib/mumble/ + cp scripts/mumble.desktop appdir/usr/share/applications/ + cp scripts/mumble.appdata.xml appdir/usr/share/metainfo/ + cp icons/mumble.svg appdir/usr/share/icons/scalable/apps/ + wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" + chmod a+x linuxdeployqt-continuous-x86_64.AppImage + ./linuxdeployqt-continuous-x86_64.AppImage $(find $HOME -type d -name 'appdir'| head -n 1)/usr/share/applications/*.desktop -appimage -extra-plugins=sqldrivers/libqsqlite.so + wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh + bash upload.sh Mumble*.AppImage* elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then wget http://www.steinberg.net/sdk_downloads/asiosdk2.3.zip -P ../ unzip ../asiosdk2.3.zip -d ../ |