Skip to content

Fixed issue with sonar scanner failing on PR's from other repositories. #720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jgebal merged 7 commits into from
Jul 18, 2018
Merged

Fixed issue with sonar scanner failing on PR's from other repositories. #720

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc49e49
Fixed issue with sonar scanner failing on PRs from other repositories.
jgebal Jul 16, 2018
2470ee2
Update sonar PR external
lwasylow Jul 17, 2018
9cc08bd
Merge branch 'develop' of github.com:utPLSQL/utPLSQL into feature/dis…
lwasylow Jul 17, 2018
0dda7d2
Merge branch 'develop' into feature/disable_sonar_pr_from_others
jgebal Jul 17, 2018
d6aeef8
Update if statment
lwasylow Jul 18, 2018
bd22fe2
Merge branch 'feature/disable_sonar_pr_from_others' of github.com:utP…
lwasylow Jul 18, 2018
2717e97
Merge branch 'develop' into feature/disable_sonar_pr_from_others
lwasylow Jul 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .travis/run_sonar_scanner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"
Expand Down