diff --git a/lib/validator.js b/lib/validator.js index 58962ecc..48a3b756 100644 --- a/lib/validator.js +++ b/lib/validator.js @@ -151,7 +151,7 @@ function validateRepo(r, data, licenses, w3cgroups) { if (hasIntersection(["rec-track"], conf["repo-type"])) { if (!mdMatch(r.license.text, license) && !mdMatch(r.license.text, licenseSw)) { reportError('invalidlicense', {error: "doesn't match SW or DOC license", license: r.license.text}); - } else if (!groups.find(g => hardcodedNotPermissiveLicensesGroups.includes(g)) && conf["repo-type"].includes("rec-track") && !mdMatch(r.license.text, licenseSw)) { + } else if (!groups.find(g => hardcodedNotPermissiveLicensesGroups.includes(g)) && conf["repo-type"].includes("rec-track") && !mdMatch(r.license.text, licenseSw)) { reportError('invalidlicense', {error: "doesn't match chartered SW license", license: r.license.text}); } } else if (hasIntersection(["cg-report"], conf["repo-type"])) { @@ -164,13 +164,13 @@ function validateRepo(r, data, licenses, w3cgroups) { reportError('nocontributing'); } else { if (hasIntersection(["rec-track"], conf["repo-type"])) { - if (!mdMatch(r.contributing.text, contributing) && !mdMatch(r.contributing.text, contributingSw)) { + if (!mdMatch(r.contributing.text, contributing) && !mdMatch(r.contributing.text, contributingSw)) { reportError('invalidcontributing', {error: "doesn't match SW or DOC contributing", contributing: r.contributing.text}); - } + } } else if (hasIntersection(["cg-report"], conf["repo-type"])) { - if (!mdMatch(r.contributing.text, contributingCg)) { + if (!mdMatch(r.contributing.text, contributingCg)) { reportError('invalidcontributing', {error: "doesn't match CG contributing", contributing: r.contributing.text}); - } + } } } } diff --git a/reporting/file-issue-for-review.js b/reporting/file-issue-for-review.js index 778a9946..fcf7d03c 100644 --- a/reporting/file-issue-for-review.js +++ b/reporting/file-issue-for-review.js @@ -204,7 +204,7 @@ if (require.main === module) { execSync(`git push origin ${Object.keys(needsPush).join(' ')}`); console.log('- done'); for (const branch in needsPush) { - const {title, specTitle, uri, repo, report} = needsPush[branch]; + const {title, repo, report} = needsPush[branch]; console.log(`Creating pull request from branch ${branch}…`); await octokit.rest.pulls.create({ owner: repoOwner,