diff --git a/lib/platform/github/index.js b/lib/platform/github/index.js index f88c0307db8c31fd090ec1860f0085105a6d00f9..28f1db17a7442b023389f4c7f33a99a2367e86fa 100644 --- a/lib/platform/github/index.js +++ b/lib/platform/github/index.js @@ -763,6 +763,7 @@ async function getPrList() { config.prList = res.body.map(pr => ({ number: pr.number, branchName: pr.head.ref, + sha: pr.head.sha, title: pr.title, state: pr.state === 'closed' && pr.merged_at && pr.merged_at.length @@ -867,6 +868,7 @@ async function getPr(prNo) { pr.displayNumber = `Pull Request #${pr.number}`; if (pr.state === 'open') { pr.branchName = pr.head ? pr.head.ref : undefined; + pr.sha = pr.head ? pr.head.sha : undefined; if (pr.mergeable === true) { pr.canMerge = true; } diff --git a/lib/workers/repository/validate.js b/lib/workers/repository/validate.js index 804a01bcc11da6715269688cbd512edbd9d2f498..f9525df7df9ffe82c93531c2500f3ac460705568 100644 --- a/lib/workers/repository/validate.js +++ b/lib/workers/repository/validate.js @@ -36,7 +36,7 @@ async function validatePrs(config) { 'PR has renovate files' ); for (const file of renovateFiles) { - const content = await platform.getFile(file, pr.branchName); + const content = await platform.getFile(file, pr.sha || pr.branchName); let parsed; try { parsed = JSON.parse(content); diff --git a/test/platform/github/__snapshots__/index.spec.js.snap b/test/platform/github/__snapshots__/index.spec.js.snap index ec700ed2e3d9ba7f847ddc45acf2d646d2bc95eb..8ad665af2e776b4981389666220fcd439e132c9b 100644 --- a/test/platform/github/__snapshots__/index.spec.js.snap +++ b/test/platform/github/__snapshots__/index.spec.js.snap @@ -456,6 +456,7 @@ Object { "isUnmergeable": true, "mergeable_state": "dirty", "number": 1, + "sha": undefined, "state": "open", } `; @@ -473,6 +474,7 @@ Object { "isStale": true, "mergeable": true, "number": 1, + "sha": undefined, "state": "open", } `; @@ -489,6 +491,7 @@ Object { "isUnmergeable": true, "mergeable_state": "dirty", "number": 1, + "sha": undefined, "state": "open", } `; @@ -505,6 +508,7 @@ Object { "isUnmergeable": true, "mergeable_state": "dirty", "number": 1, + "sha": undefined, "state": "open", } `; @@ -520,6 +524,7 @@ Object { "isUnmergeable": true, "mergeable_state": "dirty", "number": 1, + "sha": undefined, "state": "open", } `;