From 9f3b42bd71a9b55b880b4dce9f8d6491e82e7222 Mon Sep 17 00:00:00 2001 From: Raul Tambre Date: Sat, 3 Oct 2015 13:16:38 +0300 Subject: [PATCH 1/3] Hopefully fix Coverity --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 992ceabe0a..37d6c547f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,9 @@ compiler: env: global: - - secure: "jA29KvTCTR7q4BMzPPUBGazjJwrIWa7k4fo5ZSMlyxh2NbztZTKQYwodgDcXBoptCd1KJ9H3FXwBnNdMNVnTkvoPL9uWnN4K/3D1D20FCag1kmlBwnaVqVei5cRiZ9TOMuaxhjkdg8pcrQLTlXEEdMZf6A2OW0VgoBGDVSX9nYc=" + - secure: "Vf+FY48nip9JppMnq11105NealdErSWsoUhHo63/V3V+LKfA9guenxCp93/qoSIdSGC/sJwb0yIIMGvkTT/rxDJNh6Z+BWUTb2E0WEIIQbvTJNOSUzoq7dfF1LT61XjVjByFzcbC2xjtaBowmcAYEs1jGUUuEjYVCMmD5lY8hUg=" # Which Travis environment to run Coverity on - - coverity_scan_run_condition='"$CC" = gcc -a "$TRAVIS_OS_NAME" != osx' + - coverity_scan_run_condition='"$TRAVIS_OS_NAME" = linux -a "$CC" = gcc' # Test mode is for testing if it's working with Coverity. Change to true if testing, to avoid reaching the quota. - coverity_scan_script_test_mode=false @@ -91,13 +91,13 @@ addons: coverity_scan: project: name: $TRAVIS_REPO_SLUG + description: "PS3 emulator/debugger" notification_email: raul.tambre@gmail.com - build_command_prepend: "" - build_command: "make -j 4" + build_command: "make -j 4" branch_pattern: master after_success: -- coveralls --extension .c --extension .cpp --extension .h; +- if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "$TRAVIS_OS_NAME" = linux ]; then coveralls --extension .c --extension .cpp --extension .h; fi after_failure: # show memory usage again and show actions of the OOM killer From decd2b4f5acc77bb8a5cc8588c442709b9e5d104 Mon Sep 17 00:00:00 2001 From: Raul Tambre Date: Sat, 3 Oct 2015 16:16:05 +0300 Subject: [PATCH 2/3] Progress on moving to container builds --- .travis.yml | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37d6c547f1..bafa2e2add 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,43 +32,28 @@ git: before_install: # shutdown services on Travis, which may have a memory impact -# show memory usage before and after shutdown of services - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - 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; + service mysql stop; + service couchdb stop; + service redis-server stop; - 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'; - 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 -; - 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 llvm-3.6 llvm-3.6-dev libedit-dev; - sudo apt-get install aria2 -qq; + sudo apt-get install libwxgtk3.0-dev; download_extract() { aria2c -x 16 $1 -o $2 && tar -xf $2; }; fi; - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ]; then - sudo apt-get install -qq g++-4.9; export CXX="g++-4.9" CC="gcc-4.9" CXXFLAGS="-Wno-format-security"; 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 - sudo apt-get install -qq --allow-unauthenticated clang-3.6 libstdc++-4.8-dev; export CXX="clang++-3.6" CC="clang-3.6"; fi; # Travis uses CMake 2.8.7. We require 2.8.8. Grab latest # Add coverall for C++ so coverall.io could be triggered. Even it should be --coverage and gcov. - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - sudo apt-get install lib32stdc++6 -qq && aria2c -x 16 http://www.cmake.org/files/v3.0/cmake-3.0.0-Linux-i386.sh && chmod a+x cmake-3.0.0-Linux-i386.sh && sudo ./cmake-3.0.0-Linux-i386.sh --skip-license --prefix=/usr; - sudo pip install cpp-coveralls; + sudo pip install cpp-coveralls requests[security]; else brew update; brew update; brew install glew wxwidgets llvm36; @@ -88,6 +73,23 @@ script: - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -j 4; fi addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.6 + packages: + - libopenal-dev + - freeglut3-dev + - libglew-dev + - libc6-dev + - llvm-3.6 + - llvm-3.6-dev + - libedit-dev + - aria2 + - g++-4.9 + - clang-3.6 + - libstdc++-4.8-dev + - lib32stdc++6 coverity_scan: project: name: $TRAVIS_REPO_SLUG @@ -98,10 +100,3 @@ addons: after_success: - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "$TRAVIS_OS_NAME" = linux ]; then coveralls --extension .c --extension .cpp --extension .h; fi - -after_failure: -# show memory usage again and show actions of the OOM killer - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - sudo free -m -t; - sudo dmesg; - fi; From 9ee9efeb76aec5a3c5750728e64759e8a09a13f6 Mon Sep 17 00:00:00 2001 From: Raul Tambre Date: Mon, 5 Oct 2015 07:53:51 +0300 Subject: [PATCH 3/3] Change branch_pattern back to coverity_scan Doesn't seem to play nicely with forks. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bafa2e2add..68818fb382 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,7 +96,7 @@ addons: description: "PS3 emulator/debugger" notification_email: raul.tambre@gmail.com build_command: "make -j 4" - branch_pattern: master + branch_pattern: coverity_scan after_success: - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "$TRAVIS_OS_NAME" = linux ]; then coveralls --extension .c --extension .cpp --extension .h; fi