Also match commits by their commited date when polling Travis

Author: phillipj

lib/pollTravis.js

@@ -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
 
@@ -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`)