Skip to content

Also match commits by their commited date when polling Travis #24

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
phillipj merged 1 commit into from
Apr 13, 2016
Merged

Also match commits by their commited date when polling Travis #24

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
27 changes: 19 additions & 8 deletions lib/pollTravis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,25 @@ function pollByCommitThenStatus (owner, repoName, prId) {
return console.error(`! ${prInfo} Got error when retrieving GitHub commits for PR`, err.stack)
}

const lastSha = commitMetas.pop().sha
pollTravisBuildBySha({ owner, repoName, prId, lastSha })
console.log(`* ${prInfo} Started polling Travis for build by commit ${lastSha.substr(0, 7)}`)
const lastCommitMeta = commitMetas.pop()
const lastCommit = {
sha: lastCommitMeta.sha,
date: lastCommitMeta.commit.committer.date
}

pollTravisBuildBySha({ owner, repoName, prId, lastCommit })
console.log(`* ${prInfo} Started polling Travis for build by commit ${lastCommit.sha.substr(0, 7)}`)
})
}

function pollTravisBuildBySha (options, checkNumber) {
const createGhStatus = createGhStatusFn(options)
const prInfo = prInfoStr(options)
const shaToMatch = options.lastSha
const prToMatch = options.prId
const toMatch = {
sha: options.lastCommit.sha,
date: options.lastCommit.date,
prId: options.prId
}

checkNumber = checkNumber || 1

Expand All @@ -64,7 +72,10 @@ function pollTravisBuildBySha (options, checkNumber) {
}

const matchingCommit = res.commits.find((commit) => {
return commit.sha === shaToMatch || commit.pull_request_number === prToMatch
const matchesShaOrPr = commit.sha === toMatch.sha || commit.pull_request_number === toMatch.prId
const matchesCommitDate = commit.committed_at === toMatch.date

return matchesCommitDate && matchesShaOrPr
})
if (!matchingCommit) {
console.warn(`! ${prInfo} Travis hasn't picked up last commit yet, will do check #${checkNumber + 1} in 30 seconds`)
Expand Down Expand Up @@ -100,14 +111,14 @@ function createGhStatusFn (options) {
githubClient.statuses.create({
user: options.owner,
repo: options.repoName,
sha: options.lastSha,
sha: options.lastCommit.sha,
target_url: `https://travis-ci.org/${options.owner}/${options.repoName}/builds/${travisId}`,
context: 'Travis CI via nodejs-github-bot',
state: state,
description: message
}, (err, res) => {
if (err) {
return console.error(`! ${prInfo} Error while updating GitHub PR status`, err.stack)
return console.error(`! ${prInfo} Error while updating GitHub PR status`, err)
}
console.log(`* ${prInfo} Github PR status updated`)
})
Expand Down