Update build to include pull requests

lwasylow · lwasylow · commit 565746399b66 · 2018-07-12T19:21:20.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -64,8 +64,6 @@ cache:
     - $MAVEN_CFG
 
 before_install:
-  #debug
-  - if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ]; then bash .travis/run_sonar_scanner.sh; fi
   #The update_project_version.sh is done before deployment to validate that the change of project files does not break installation
   - bash .travis/update_project_version.sh
   # download latest utPLSQL release
diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh
@@ -32,12 +32,13 @@ fi
 echo "Check if we running from develop or on branch"
 if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [[ ! "${BRANCH}" =~ ^(release/v[0-9]+\.[0-9]+\.[0-9]+.*|"${MAIN_DEV_BRANCH}")$ ]]; then
     
+    echo "" >> sonar-project.properties
     if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then 
-        echo "Updating sonar properties to include branch name"
+        echo "Updating sonar properties to include branch ${BRANCH}"
         add_sonar_property "${BRANCH_SONAR_PROPERTY}" "${BRANCH}" 
         add_sonar_property "${BRANCH_SONAR_TARGET_PROPERTY}" "${MAIN_DEV_BRANCH}" 
      else
-       echo "Updating sonar properties to include pull request name"
+       echo "Updating sonar properties to include pull request ${BRANCH}"
        add_sonar_property "${PR_SONAR_TOKEN_PROPERTY}" "${GITHUB_TRAVISCI_TOKEN}"
        add_sonar_property "${PR_SONAR_BRANCH_PROPERTY}" "${BRANCH}"
        add_sonar_property "${PR_KEY_PROPERTY}" "${PR}"
@@ -47,8 +48,5 @@ else
     echo "No need to update sonar we building on release or develop"
 fi
 
-#debug
-cat sonar-project.properties
-
 #Execute Sonar scanner
-#sonar-scanner
+sonar-scanner
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -24,4 +24,4 @@ sonar.pullrequest.github.endpoint=https://api.github.com/
 sonar.pullrequest.github.repository=utPLSQL/utPLSQL
 
 # Encoding of the source code. Default is default system encoding
-#sonar.sourceEncoding=UTF-8
+#sonar.sourceEncoding=UTF-8
