Skip to content

ci: Fixed env.CHANGE_BRANCH expansion issue #18

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

Closed
salvatore-coppola wants to merge 1 commit into from
Closed

ci: Fixed env.CHANGE_BRANCH expansion issue #18

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
4 changes: 3 additions & 1 deletion vars/continuousIntegrationPipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import static groovy.json.JsonOutput.prettyPrint

import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
import java.util.regex.Pattern
import org.apache.commons.text.StringEscapeUtils

def boolean onlyDocumentationFilesChangedIn(String workDirectory) {
if (!env.CHANGE_TARGET) {
Expand Down Expand Up @@ -153,8 +154,9 @@ def call(Map pipelineParams = [:]) {

// Check if on primary branch
def analysisParameters = ""
def changeBranch = StringEscapeUtils.escapeShellArg(env.CHANGE_BRANCH);
if (isPullRequest()) {
analysisParameters = "-Dsonar.pullrequest.branch=${env.CHANGE_BRANCH} -Dsonar.pullrequest.base=${env.CHANGE_TARGET} -Dsonar.pullrequest.key=${env.CHANGE_ID}"
analysisParameters = "-Dsonar.pullrequest.branch=${changeBranch} -Dsonar.pullrequest.base=${env.CHANGE_TARGET} -Dsonar.pullrequest.key=${env.CHANGE_ID}"
} else {
analysisParameters = "-Dsonar.branch.name=${env.BRANCH_NAME}"
}
Expand Down