mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-12-29 03:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update LLVM on Travis

Browse Source 
Should fix the issue with Travis (No available formula with the name "llvm36"). 
We're using 3.8 so there's no reason for Travis to use 3.6.
This commit is contained in:
AnnieL 2017-01-18 13:57:50 +00:00 committed by Ivan
parent 2d9e02b0a7
commit b4c77afdc4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -42,14 +42,14 @@ before_install:
sudo pip install cpp-coveralls requests[security]; sudo pip install cpp-coveralls requests[security];
else else
brew update; brew update; brew update; brew update;
brew install glew wxwidgets llvm36; brew install glew wxwidgets llvm38;
fi; fi;
before_script: before_script:
- git submodule update --init rsx_program_decompiler asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal - git submodule update --init rsx_program_decompiler asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal
- mkdir build - mkdir build
- cd build - cd build
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ..; else cmake .. -DLLVM_DIR=/usr/local/opt/llvm36/lib/llvm-3.6/share/llvm/cmake; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ..; else cmake .. -DLLVM_DIR=/usr/local/opt/llvm38/lib/llvm-3.8/share/llvm/cmake; fi
script: script:
# Add a command to show all the variables. May be useful for debugging Travis. # Add a command to show all the variables. May be useful for debugging Travis.
@ -62,15 +62,15 @@ addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
# - llvm-toolchain-trusty-3.6 temporarily disabled # - llvm-toolchain-trusty-3.8 temporarily disabled
packages: packages:
- cmake - cmake
- libopenal-dev - libopenal-dev
- freeglut3-dev - freeglut3-dev
- libglew-dev - libglew-dev
- libc6-dev - libc6-dev
# - llvm-3.6 # - llvm-3.8
# - llvm-3.6-dev # - llvm-3.8-dev
- libedit-dev - libedit-dev
- g++-5 - g++-5
- gcc-5 - gcc-5