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

TravisCI improvements (#2460)

Browse source 
* TravisCI: cleanup indentation

2 spaces for indentation

* TravisCI: make jobs drop to 3

TravisCI allocates 2 cpus per build instance

* TravisCI: move package installation to apt addon block

* TravisCI: make pip install to user directory

Also disable sudo for faster bootup

* TravisCI: expand if condition to multiple lines

Also remove outdated comment
This commit is contained in:
Chocobo1 2017-03-04 21:22:46 +08:00 • committed by Ivan
parent 48b0583866
commit ef5225b776
1 changed files with 47 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

41
.travis.yml
View file

@ -1,10 +1,10 @@
language: cpp language: cpp
sudo: required sudo: false
dist: trusty dist: trusty
os: os:
- linux - linux
# - osx #- osx
osx_image: xcode6.4 osx_image: xcode6.4
@ -34,17 +34,13 @@ git:
submodules: false submodules: false
before_install: before_install:
# shutdown services on Travis, which may have a memory impact
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
sudo apt-get install -y libwxgtk3.0-dev;
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';
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
sudo pip install cpp-coveralls requests[security]; pip install --user cpp-coveralls requests[security];
else else
brew update; brew update; brew update; brew update;
brew install ccache glew wxwidgets llvm38; brew install ccache glew wxwidgets llvm38;
@ -54,42 +50,47 @@ 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/llvm38/lib/llvm-3.8/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.
# - echo "--Shell Export Lists START--" ; export -p; echo "--Shell Export Lists STOP--"; #- echo "--Shell Export Lists START--" ; export -p; echo "--Shell Export Lists STOP--";
# And to ensure the versions of toolchain # And to ensure the versions of toolchain
- echo "--CXX version?"; "$CXX" --version; echo "--CXX version confirmed"; - echo "--CXX version?"; "$CXX" --version; echo "--CXX version confirmed";
- if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -j 4; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -j 3; fi
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
# - llvm-toolchain-trusty-3.8 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.8 #- llvm-3.8
# - llvm-3.8-dev #- llvm-3.8-dev
- libedit-dev - libedit-dev
- g++-5 - g++-5
- gcc-5 - gcc-5
# - clang-3.6 #- clang-3.6
- libstdc++-5-dev - libstdc++-5-dev
- lib32stdc++6 - lib32stdc++6
- zlib1g-dev - zlib1g-dev
- libwxgtk3.0-dev
coverity_scan: coverity_scan:
project: project:
name: $TRAVIS_REPO_SLUG name: $TRAVIS_REPO_SLUG
description: "PS3 emulator/debugger" description: "PS3 emulator/debugger"
notification_email: nekotekina@gmail.com notification_email: nekotekina@gmail.com
build_command: "make -j 4" build_command: "make -j 3"
branch_pattern: coverity_scan branch_pattern: coverity_scan
after_success: after_success:
- if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "$TRAVIS_OS_NAME" = linux ]; then coveralls --extension .c --extension .cpp --extension .h; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "$TRAVIS_OS_NAME" = linux ]; then coveralls --extension .c --extension .cpp --extension .h; fi