ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci: Add clang 3.8 to Travis CI

This commit is contained in:
Jonathan Li 2016-08-17 21:52:54 +01:00
parent c9a1097579
commit 029468e7b4
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -16,6 +16,9 @@ matrix:
- env: VERSION=4.9 BITS=32 - env: VERSION=4.9 BITS=32
compiler: gcc-4.9-32 compiler: gcc-4.9-32
os: linux os: linux
- env: VERSION=3.8 BITS=32
compiler: clang-3.8-32
os: linux
- env: VERSION=4.9 BITS=64 - env: VERSION=4.9 BITS=64
compiler: gcc-4.9-64 compiler: gcc-4.9-64
os: linux os: linux

8
travis.sh
View File

@ -10,8 +10,8 @@ linux_32_before_install() {
# Compilers # Compilers
if [ "${CXX}" = "clang++" ]; then if [ "${CXX}" = "clang++" ]; then
sudo apt-key adv --fetch-keys http://llvm.org/apt/llvm-snapshot.gpg.key sudo apt-key adv --fetch-keys http://apt.llvm.org/llvm-snapshot.gpg.key
sudo add-apt-repository -y "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-${VERSION} main" sudo add-apt-repository -y "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-${VERSION} main"
# g++-4.9-multilib is necessary for compiler dependencies. 4.8 currently # g++-4.9-multilib is necessary for compiler dependencies. 4.8 currently
# has dependency issues, but 4.9 from the toolchain repo seems to work # has dependency issues, but 4.9 from the toolchain repo seems to work
# fine, so let's just use that. # fine, so let's just use that.
@ -83,8 +83,8 @@ linux_32_script() {
linux_64_before_install() { linux_64_before_install() {
# Compilers # Compilers
if [ "${CXX}" = "clang++" ]; then if [ "${CXX}" = "clang++" ]; then
sudo apt-key adv --fetch-keys http://llvm.org/apt/llvm-snapshot.gpg.key sudo apt-key adv --fetch-keys http://apt.llvm.org/llvm-snapshot.gpg.key
sudo add-apt-repository -y "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-${VERSION} main" sudo add-apt-repository -y "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-${VERSION} main"
COMPILER_PACKAGE="clang-${VERSION}" COMPILER_PACKAGE="clang-${VERSION}"
fi fi
if [ "${CXX}" = "g++" ]; then if [ "${CXX}" = "g++" ]; then