Merge pull request #720 from utPLSQL/feature/disable_sonar_pr_from_others

jgebal · web-flow · commit db969b632838 · 2018-07-18T07:51:08.000+01:00
Fixed issue with sonar scanner failing on PR's from other repositories.
diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh
@@ -30,7 +30,7 @@ else
 fi   
 
 
-#Are we running on develop branch ?
+#Are we running on utPLSQL repo and not an external PR?
 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
     
@@ -39,12 +39,14 @@ if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [[ ! "${BRANCH}" =~ ^(releas
         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
+     elif [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_REPO_SLUG}" ]; then
        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}"
        add_sonar_property "${PR_SONAR_BASE_PROPERTY}" "${PR_BRANCH}"
+     else
+       echo "PR from external source no changes to properties."
      fi    
 else
     echo "No need to update sonar we building on release or develop"
