diff options
Diffstat (limited to '.ci')
| -rw-r--r-- | .ci/bintray-release.json | 4 | ||||
| -rwxr-xr-x | .ci/install.sh | 7 | ||||
| -rwxr-xr-x | .ci/linux/deploy.sh | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/.ci/bintray-release.json b/.ci/bintray-release.json index 7115c910..ab6d17ba 100644 --- a/.ci/bintray-release.json +++ b/.ci/bintray-release.json @@ -5,14 +5,14 @@ "matrixParams": { "override": 1 }, - "uploadPattern": "VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE.dmg" + "uploadPattern": "nheko/VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE.dmg" }, { "includePattern": "nheko-VERSION_NAME_VALUE-x86_64.AppImage", "matrixParams": { "override": 1 }, - "uploadPattern": "VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE-x86_64.AppImage" + "uploadPattern": "nheko/VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE-x86_64.AppImage" } ], "package": { diff --git a/.ci/install.sh b/.ci/install.sh index ee172581..da5db114 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -5,7 +5,7 @@ set -ex if [ $TRAVIS_OS_NAME == osx ]; then brew update brew install qt5 lmdb clang-format ninja libsodium spdlog - brew upgrade boost + brew upgrade boost cmake curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py sudo python get-pip.py @@ -24,16 +24,17 @@ if [ $TRAVIS_OS_NAME == linux ]; then QT_PKG="59" fi + wget https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.sh + sudo sh cmake-3.11.4-Linux-x86_64.sh --skip-license --prefix=/usr/local + sudo add-apt-repository -y ppa:chris-lea/libsodium sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty - sudo add-apt-repository -y ppa:george-edison55/cmake-3.x sudo apt-get update -qq sudo apt-get install -qq -y \ qt${QT_PKG}base \ qt${QT_PKG}tools \ qt${QT_PKG}svg \ qt${QT_PKG}multimedia \ - cmake \ liblmdb-dev \ libsodium-dev fi diff --git a/.ci/linux/deploy.sh b/.ci/linux/deploy.sh index 7b5b8e4a..a721f2be 100755 --- a/.ci/linux/deploy.sh +++ b/.ci/linux/deploy.sh @@ -32,6 +32,10 @@ unset LD_LIBRARY_PATH export ARCH=$(uname -m) +if [ ! -z $TRAVIS_TAG ]; then + export LD_LIBRARY_PATH=.deps/usr/lib/:/opt/qt${QT_PKG}/lib/:$LD_LIBRARY_PATH +fi + ./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -bundle-non-qt-libs ./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -appimage |