From 794b9ceb1be23d20f21094843f597dc9dc6708fb Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris <sideris.konstantin@gmail.com> Date: Sat, 23 Jun 2018 21:17:33 +0300 Subject: [PATCH] Add entry for GCC5 on Travis-CI --- .ci/linux/deploy.sh | 2 +- .travis.yml | 15 ++++++++++++++- README.md | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.ci/linux/deploy.sh b/.ci/linux/deploy.sh index a721f2bef..5859fc4a4 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 a0ea4e927..897368982 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,20 @@ matrix: - DEPLOYMENT=1 - USE_BUNDLED_BOOST=0 - USE_BUNDLED_SPDLOG=0 + - 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: @@ -23,7 +37,6 @@ matrix: - 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 98d249a52..90692f422 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ nheko ---- [](https://travis-ci.org/mujx/nheko) [](https://ci.appveyor.com/project/mujx/nheko/branch/master) -[](https://bintray.com/mujx/matrix/nheko/_latestVersion) +[](https://bintray.com/mujx/matrix/nheko/v0.4.3) [](https://bintray.com/mujx/matrix/nheko/nightly) [](https://matrix.to/#/#nheko:matrix.org) [](https://aur.archlinux.org/packages/nheko) -- GitLab