From da85fba0156ab66aa8b6bbdb6d82ac69c4417dca Mon Sep 17 00:00:00 2001 From: luxsie Date: Thu, 9 Apr 2015 02:02:54 +0800 Subject: [PATCH 1/3] Modify .travis.yml to enable Travis. Fix the master git repo name in Github, also the one in git-version-gen.cmd. Display Shell Export List to help debugging our Travis Build. --- .travis.yml | 11 ++++++++++- README.md | 2 +- Utilities/git-version-gen.cmd | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8fef9bddc8..2d8150cbd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,8 @@ before_install: 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; +# Add coverall for C++ so coverity could be triggered. Even it should be --coverage and gcov. + - sudo pip install cpp-coveralls before_script: - git submodule update --init asmjit ffmpeg llvm @@ -51,5 +53,12 @@ addons: build_command: "make -j 4" branch_pattern: coverity_scan +# These modifys are from https://github.com/devernay/cminpack/blob/master/.travis.yml +# It passed but when coverall it failed. script: - - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then make -j 4; fi +# Add a command to show all the variables now. maybe only useful for debugging travis. + - echo "--Shell Export Lists START--" ; export -p; echo "--Shell Export Lists STOP--" + - 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 + diff --git a/README.md b/README.md index 7d5516bbac..cbcc27e346 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ RPCS3 ===== -[![Build Status](https://travis-ci.org/DHrpcs3/rpcs3.svg?branch=master)](https://travis-ci.org/DHrpcs3/rpcs3) +[![Build Status](https://travis-ci.org/RPCS3/rpcs3.svg?branch=master)](https://travis-ci.org/RPCS3/rpcs3) Coverity Scan Build Status NUL 2> NUL if errorlevel 1 ( echo Git not on path, trying default Msysgit paths set GIT="%ProgramFiles(x86)%\Git\bin\git.exe" - call !GIT! describe > NUL 2> NUL + call %GIT% describe > NUL 2> NUL if errorlevel 1 ( set GIT="%ProgramFiles%\Git\bin\git.exe" ) From a2ab685ba92f5251d165f712e2e3a4f6471632ab Mon Sep 17 00:00:00 2001 From: luxsie Date: Thu, 9 Apr 2015 20:43:46 +0800 Subject: [PATCH 2/3] Small change for Badges in README.md. --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index cbcc27e346..51ab3095f2 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,7 @@ RPCS3 ===== [![Build Status](https://travis-ci.org/RPCS3/rpcs3.svg?branch=master)](https://travis-ci.org/RPCS3/rpcs3) - - - Coverity Scan Build Status - - +[![Coverity Status](https://scan.coverity.com/projects/3960/badge.svg)](https://scan.coverity.com/projects/3960) [![Coverage Status](https://coveralls.io/repos/DHrpcs3/rpcs3/badge.svg)](https://coveralls.io/r/DHrpcs3/rpcs3) An open-source PlayStation 3 emulator/debugger written in C++. From ef7166057a100c1e67235ee23f4597054c3ce0be Mon Sep 17 00:00:00 2001 From: luxsie Date: Thu, 9 Apr 2015 21:30:24 +0800 Subject: [PATCH 3/3] Revert Non-Necessary Change. Thank Bigpet. --- Utilities/git-version-gen.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/git-version-gen.cmd b/Utilities/git-version-gen.cmd index 2852592086..4ec3e10d20 100644 --- a/Utilities/git-version-gen.cmd +++ b/Utilities/git-version-gen.cmd @@ -25,7 +25,7 @@ call %GIT% describe > NUL 2> NUL if errorlevel 1 ( echo Git not on path, trying default Msysgit paths set GIT="%ProgramFiles(x86)%\Git\bin\git.exe" - call %GIT% describe > NUL 2> NUL + call !GIT! describe > NUL 2> NUL if errorlevel 1 ( set GIT="%ProgramFiles%\Git\bin\git.exe" )