d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 07:18:08 +00:00
Code Issues Projects Releases Wiki Activity

Use gcc-5 for TravisCI linux builds

Browse Source 
Remove workarounds for CXXFLAGS.
Using 3 compilation jobs should cause process trashing, tune it down to 2.
TravisCI container builds is deprecated, so remove the `sudo: false` command.
This commit is contained in:
Chocobo1 2018-12-08 12:35:23 +08:00
parent 2a428ffd37
commit 1b2cdda7e2
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.travis.yml
View File

@ -39,8 +39,6 @@ cache:
# opt-in Ubuntu Trusty # opt-in Ubuntu Trusty
dist: trusty dist: trusty
# container-based builds
sudo: false
addons: addons:
coverity_scan: coverity_scan:
@ -67,20 +65,21 @@ addons:
- [libboost-dev, libboost-system-dev] - [libboost-dev, libboost-system-dev]
- libtorrent-rasterbar-dev - libtorrent-rasterbar-dev
- [qt55base, qt55svg, qt55tools] - [qt55base, qt55svg, qt55tools]
- [gcc-6, g++-6] - [gcc-5, g++-5]
before_install: before_install:
# only allow specific build for coverity scan, others will stop # only allow specific build for coverity scan, others will stop
- if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" = "RC_1_0" -a "$gui" = true -a "$build_system" = "qmake" ]; then exit ; fi - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" = "RC_1_0" -a "$gui" = true -a "$build_system" = "qmake" ]; then exit ; fi
- shopt -s expand_aliases - shopt -s expand_aliases
- alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system) - alias make="colormake -j2" # Using nprocs/2 sometimes may fail (gcc is killed by system)
- qbt_path="$HOME/qbt_install" - qbt_path="$HOME/qbt_install"
- | - |
if [ "$TRAVIS_OS_NAME" = "linux" ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then
qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH=/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH" qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH=/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH"
else else
qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH" qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedefs -Wno-inconsistent-missing-override"
fi fi
# options for specific branches # options for specific branches
@ -93,10 +92,7 @@ before_install:
# Qt 5 # Qt 5
PATH=/opt/qt55/bin:${PATH} PATH=/opt/qt55/bin:${PATH}
if [ "$build_system" = "cmake" ]; then export CXX="${CXX}-5" CC="${CC}-5"
COMPILER_VERSION=6
export CXX="${CXX}-${COMPILER_VERSION}" CC="${CC}-${COMPILER_VERSION}"
fi
fi fi
# print settings # print settings
@ -156,18 +152,7 @@ script:
BUILD_TOOL="ninja" BUILD_TOOL="ninja"
fi fi
if [ "$build_system" = "qmake" ]; then if [ "$build_system" = "qmake" ]; then
if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./bootstrap.sh && ./configure $qbtconf CXXFLAGS="$CXXFLAGS"
# For some reason for RC_1_1 we need to also specify the OpenSSL compiler/linker flags
# Homebrew doesn't symlink OpenSSL for security reasons
./bootstrap.sh
./configure $qbtconf CXXFLAGS="$CXXFLAGS -std=c++14"
sed -i "" -e "s/^\(CC.*&&\).*$/\1 $CC/" src/Makefile # workaround for Qt & ccache: https://bugreports.qt.io/browse/QTBUG-31034
sed -i "" -e "s/^\(CXX.*&&\).*$/\1 $CXX/" src/Makefile
sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs -Wno-inconsistent-missing-override/' src/Makefile
else
./bootstrap.sh && ./configure $qbtconf
fi
BUILD_TOOL="make" BUILD_TOOL="make"
fi fi
- $BUILD_TOOL && $BUILD_TOOL install - $BUILD_TOOL && $BUILD_TOOL install