Merge afdafbf into 282ad5e

utPLSQL · Mar 6, 2019 · e424db8 · e424db8
2 parents 282ad5e + afdafbf
commit e424db8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -94,7 +94,7 @@ before_script:
 script:
   - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi
-  - if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_REPO_SLUG}" ]; then bash .travis/run_sonar_scanner.sh; fi
+  - if [[ ! $TRAVIS_TAG ]] && [[ ("${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" && "${TRAVIS_PULL_REQUEST}" == false) || ("${TRAVIS_PULL_REQUEST_SLUG}" = "${UTPLSQL_REPO}") ]]; then bash .travis/run_sonar_scanner.sh; fi
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi
 
 notifications:

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -18,6 +18,7 @@ sonar.links.homepage=https://github.com/utPLSQL/utPLSQL
 sonar.projectDescription=PL/SQL Unit Testing Framework
 sonar.plsql.file.suffixes=sql,tab,pkb,tpb
 sonar.language=plsql
+sonar.inclusions=./source/reporters/** , ./source/api/** , ./source/core/** , ./source/expectations/**
 
 sonar.pullrequest.provider=github
 sonar.pullrequest.github.endpoint=https://api.github.com/