Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for icons on OSes other than Windows. Small fixes for travis

Browse Source 
Didn't test. Also added memory monitoring to travis.
This commit is contained in:
Danila Malyutin
2015-07-11 03:15:07 +03:00
parent e338c3938b
commit 7795305c9f
3 changed files with 316 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+18 -5
View File
@@ -7,7 +7,6 @@ compiler:
env:
global:
- secure: "jA29KvTCTR7q4BMzPPUBGazjJwrIWa7k4fo5ZSMlyxh2NbztZTKQYwodgDcXBoptCd1KJ9H3FXwBnNdMNVnTkvoPL9uWnN4K/3D1D20FCag1kmlBwnaVqVei5cRiZ9TOMuaxhjkdg8pcrQLTlXEEdMZf6A2OW0VgoBGDVSX9nYc="
branches:
only:
- master
@@ -16,21 +15,31 @@ git:
submodules: false
before_install:
# shutdown services on Travis, which may have a memory impact
# show memory usage before and after shutdown of services
- sudo service --status-all
- sudo free -m -t
- sudo /etc/init.d/mysql stop
- sudo /etc/init.d/postgresql stop
- sudo /etc/init.d/couchdb stop
- sudo /etc/init.d/redis-server stop
- sudo free -m -t
- echo "yes" | sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc
- echo "yes" | sudo apt-add-repository 'deb http://repos.codelite.org/wx3.0/ubuntu/ precise universe'
# Add later version of Clang, apt from llvm.org. the repository link is for development version.
- echo "yes" | sudo add-apt-repository 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu precise main'
- echo "yes" | sudo add-apt-repository 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.6 main'
- wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -;
# And the libstdc++4.8 of GCC from ppa
# And the libstdc++4.9 of GCC from ppa
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get update
- sudo apt-get install libwxgtk3.0-dev libopenal-dev freeglut3-dev libglew-dev libc6-dev
- sudo apt-get install aria2 -qq
- download_extract() { aria2c -x 16 $1 -o $2 && tar -xf $2; }
- if [ "$CXX" = "g++" ]; then
sudo apt-get install -qq g++-4.8;
export CXX="g++-4.8" CC="gcc-4.8";
sudo apt-get install -qq g++-4.9;
export CXX="g++-4.9" CC="gcc-4.9";
else
sudo apt-get install -qq --allow-unauthenticated llvm-3.6 llvm-3.6-dev clang-3.6 libstdc++-4.8-dev;
export CXX="clang++-3.6" CC="clang-3.6";
@@ -75,4 +84,8 @@ script:
- if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -j 4; fi
after_success:
- if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then coveralls --extension .c --extension .cpp --extension .h; fi
after_failure:
# show memory usage again
- sudo free -m -t
# show actions of the OOM killer
- sudo dmesg