diff options
author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-06-23 21:17:33 +0300 |
---|---|---|
committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-06-23 21:17:33 +0300 |
commit | 794b9ceb1be23d20f21094843f597dc9dc6708fb (patch) | |
tree | b58fb9525c39216437bb8aeb9ced1e263fdbb4ba | |
parent | Allow copying the version info in the settings page (diff) | |
download | nheko-794b9ceb1be23d20f21094843f597dc9dc6708fb.tar.xz |
Add entry for GCC5 on Travis-CI
-rwxr-xr-x | .ci/linux/deploy.sh | 2 | ||||
-rw-r--r-- | .travis.yml | 15 | ||||
-rw-r--r-- | README.md | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/.ci/linux/deploy.sh b/.ci/linux/deploy.sh index a721f2be..5859fc4a 100755 --- a/.ci/linux/deploy.sh +++ b/.ci/linux/deploy.sh @@ -33,7 +33,7 @@ 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 + export LD_LIBRARY_PATH=.deps/usr/lib/:$LD_LIBRARY_PATH fi ./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -bundle-non-qt-libs diff --git a/.travis.yml b/.travis.yml index a0ea4e92..89736898 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,11 +19,24 @@ matrix: - os: linux compiler: gcc env: + - CXX_COMPILER=g++-5 + - C_COMPILER=gcc-5 + - QT_VERSION="-5.10.1" + - QT_PKG=510 + - DEPLOYMENT=1 + - USE_BUNDLED_BOOST=1 + - USE_BUNDLED_SPDLOG=1 + addons: + apt: + sources: ["ubuntu-toolchain-r-test"] + packages: ["g++-5", "ninja-build"] + - os: linux + compiler: gcc + env: - CXX_COMPILER=g++-7 - C_COMPILER=gcc-7 - QT_VERSION="-5.10.1" - QT_PKG=510 - - DEPLOYMENT=1 - USE_BUNDLED_BOOST=1 - USE_BUNDLED_SPDLOG=1 addons: diff --git a/README.md b/README.md index 98d249a5..90692f42 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ nheko ---- [![Build Status](https://travis-ci.org/mujx/nheko.svg?branch=master)](https://travis-ci.org/mujx/nheko) [![Build status](https://ci.appveyor.com/api/projects/status/07qrqbfylsg4hw2h/branch/master?svg=true)](https://ci.appveyor.com/project/mujx/nheko/branch/master) -[![Latest Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://bintray.com/mujx/matrix/nheko/_latestVersion) +[![Latest Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://bintray.com/mujx/matrix/nheko/v0.4.3) [![Nightly](https://img.shields.io/badge/download-nightly-green.svg)](https://bintray.com/mujx/matrix/nheko/nightly) [![Chat on Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#nheko:matrix.org) [![AUR: nheko](https://img.shields.io/badge/AUR-nheko-blue.svg)](https://aur.archlinux.org/packages/nheko) |