Skip to content

Don't specify target branch when branch is master #139

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
Israphel merged 1 commit into from
Oct 28, 2019
Merged

Don't specify target branch when branch is master #139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions sonar-scanner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,17 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-Dsonar.pullrequest.branch=$TRAVIS_PULL_REQUEST_BRANCH \
-Dsonar.pullrequest.base=$TRAVIS_BRANCH
else
if [ "$TRAVIS_BRANCH" == 'develop' ]; then
TARGET_BRANCH='master'
if [ "$TRAVIS_BRANCH" == 'master' ]; then
sonar_scanner \
-Dsonar.branch.name=$TRAVIS_BRANCH
else
TARGET_BRANCH='develop'
if [ "$TRAVIS_BRANCH" == 'develop' ]; then
TARGET_BRANCH='master'
else
TARGET_BRANCH='develop'
fi
sonar_scanner \
-Dsonar.branch.name=$TRAVIS_BRANCH \
-Dsonar.branch.target=$TARGET_BRANCH
fi
sonar_scanner \
-Dsonar.branch.name=$TRAVIS_BRANCH \
-Dsonar.branch.target=$TARGET_BRANCH
fi