archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove some llvm packages from travis CI and switch to 14.04 (#1740)

Browse source 
Trusty has good enough clang (3.5) to build rpcs3, as fo llvm:
we don't use it currently and travis fails due to: http://lists.llvm.org/pipermail/llvm-dev/2016-May/100303.html
This commit is contained in:
Danila Malyutin 2016-06-02 23:58:04 +03:00 • committed by Ivan
parent ee645d054d
commit 713ae91e27
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
.travis.yml
View file

@ -1,4 +1,6 @@
language: cpp language: cpp
sudo: required
dist: trusty
os: os:
- linux - linux
@ -33,16 +35,11 @@ git:
before_install: before_install:
# shutdown services on Travis, which may have a memory impact # shutdown services on Travis, which may have a memory impact
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
sudo apt-get install libwxgtk3.0-dev; sudo apt-get install -y libwxgtk3.0-dev;
sudo apt-add-repository -y ppa:libreoffice/ppa;
sudo apt-get update;
sudo apt-get install libglew-dev;
fi; fi;
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ]; then - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ]; then
export CXX="g++-5" CC="gcc-5" CXXFLAGS="-Wno-format-security"; export CXX="g++-5" CC="gcc-5" CXXFLAGS="-Wno-format-security";
export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'; export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01';
elif [ "$TRAVIS_OS_NAME" = "linux" ]; then
export CXX="clang++-3.6" CC="clang-3.6";
fi; fi;
# Add coverall for C++ so coverall.io could be triggered. Even it should be --coverage and gcov. # Add coverall for C++ so coverall.io could be triggered. Even it should be --coverage and gcov.
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
@ -69,21 +66,20 @@ addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.6 # - llvm-toolchain-trusty-3.6 temporarily disabled
- kubuntu-backports
packages: packages:
- cmake - cmake
- libopenal-dev - libopenal-dev
- freeglut3-dev - freeglut3-dev
# - libglew-dev apt version is too old - libglew-dev
- libc6-dev - libc6-dev
- llvm-3.6 # - llvm-3.6
- llvm-3.6-dev # - llvm-3.6-dev
- libedit-dev - libedit-dev
- g++-5 - g++-5
- gcc-5 - gcc-5
- clang-3.6 # - clang-3.6
- libstdc++-4.8-dev - libstdc++-5-dev
- lib32stdc++6 - lib32stdc++6
- zlib1g-dev - zlib1g-dev
coverity_scan: coverity_scan: