jenkins: fix small bugs in trigger-jenkins-build

maclover7 · web-flow · commit c1c2ad34c120 · 2018-06-01T23:14:15.000-04:00
PR-URL: #174 Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/scripts/trigger-jenkins-build.js b/scripts/trigger-jenkins-build.js
@@ -56,6 +56,10 @@ function buildParametersForRepo (options, repo) {
     {
       name: 'PR_ID',
       value: options.number
+    },
+    {
+      name: 'REBASE_ONTO',
+      value: '<pr base branch>'
     }
     ]
   }
@@ -172,7 +176,7 @@ module.exports = (app) => {
         return logger.debug(`Ignoring comment to me by @${pullRequestAuthor} because they are not a repo collaborator`)
       }
 
-      triggerBuild(options, replyToCollabWithBuildStarted)
+      triggerBuild(options, logBuildStarted)
     }
 
     githubClient.repos.checkCollaborator({ owner, repo, username: pullRequestAuthor }, triggerBuildWhenCollaborator)

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,10 @@ function buildParametersForRepo (options, repo) {`
`56`	`56`	`{`
`57`	`57`	`name: 'PR_ID',`
`58`	`58`	`value: options.number`
	`59`	`+ },`
	`60`	`+ {`
	`61`	`+ name: 'REBASE_ONTO',`
	`62`	`+ value: '<pr base branch>'`
`59`	`63`	`}`
`60`	`64`	`]`
`61`	`65`	`}`
`@@ -172,7 +176,7 @@ module.exports = (app) => {`
`172`	`176`	return logger.debug(`Ignoring comment to me by @${pullRequestAuthor} because they are not a repo collaborator`)
`173`	`177`	`}`
`174`	`178`
`175`		`- triggerBuild(options, replyToCollabWithBuildStarted)`
	`179`	`+ triggerBuild(options, logBuildStarted)`
`176`	`180`	`}`
`177`	`181`
`178`	`182`	`githubClient.repos.checkCollaborator({ owner, repo, username: pullRequestAuthor }, triggerBuildWhenCollaborator)`