Better protection for the build task if a user doesn't have the project parameters defined

This commit is contained in:
pahimar 2014-06-04 21:38:50 -04:00
parent 6094a3d7f6
commit 45984f8e26

View file

@ -67,15 +67,15 @@ import net.minecraftforge.gradle.tasks.dev.ChangelogTask
task createChangelog(type: ChangelogTask) { task createChangelog(type: ChangelogTask) {
def jobName = "${System.getenv().JOB_NAME}" def jobName = "${System.getenv().JOB_NAME} ?: ''"
def buildNumber = "${System.getenv().BUILD_NUMBER}" def buildNumber = "${System.getenv().BUILD_NUMBER}"
setServerRoot(new DelayedString(project, project.jenkins_server)) setServerRoot(new DelayedString(project, "project.jenkins_server ?: ''"))
setJobName(new DelayedString(project, jobName.toString())) setJobName(new DelayedString(project, jobName.toString()))
setAuthName(new DelayedString(project, project.jenkins_user)) setAuthName(new DelayedString(project, "project.jenkins_user ?: ''"))
setAuthPassword(new DelayedString(project, project.jenkins_password)) setAuthPassword(new DelayedString(project, "project.jenkins_password ?: ''"))
setTargetBuild({ buildNumber.toString() }); setTargetBuild({ buildNumber.toString() });
setOutput(new DelayedFile(project, 'build/libs/' + project.getName() + '-' + project.version + '-changelog.txt')); setOutput(new DelayedFile(project, 'build/libs/' + jobName.toString() + '-' + project.version + '-changelog.txt'));
onlyIf { onlyIf {
return (("${System.getenv().JOB_NAME}" != null) && project.hasProperty("jenkins_server") && project.hasProperty("jenkins_password")) return (("${System.getenv().JOB_NAME}" != null) && project.hasProperty("jenkins_server") && project.hasProperty("jenkins_password"))