From 22bfbe95b91a325f20075b92d534d68ce09a7cb2 Mon Sep 17 00:00:00 2001 From: Randell Dawson Date: Thu, 29 Nov 2018 12:11:54 -0800 Subject: [PATCH] fix: changed rateLimter time in close-open --- labeler.js | 39 ------------------- .../close-open-specific-failures.js | 12 +++--- pr-tasks/close-open.js | 4 +- 3 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 labeler.js diff --git a/labeler.js b/labeler.js deleted file mode 100644 index 0f67e37fdb..0000000000 --- a/labeler.js +++ /dev/null @@ -1,39 +0,0 @@ -const { validLabels } = require('./validation'); -const { addLabels } = require('./pr-tasks'); -const { rateLimiter } = require('./utils'); - -const labeler = async (number, prFiles, currentLabels, guideFolderErrorsComment) => { - const labelsToAdd = {}; // holds potential labels to add based on file path - if (guideFolderErrorsComment) { - labelsToAdd['status: needs update'] = 1; - } - const existingLabels = currentLabels.map(({ name }) => name); - prFiles.forEach(({ filename }) => { - /* remove '/challenges' from filename so language variable hold the language */ - const filenameReplacement = filename.replace(/^curriculum\/challenges\//, 'curriculum\/'); - const regex = /^(docs|curriculum|guide)(?:\/)(arabic|chinese|portuguese|russian|spanish)?\/?/ - const [ _, articleType, language ] = filenameReplacement.match(regex) || []; // need an array to pass to labelsAdder - - if (articleType && validLabels[articleType]) { - labelsToAdd[validLabels[articleType]] = 1 - } - if (language && validLabels[language]) { - labelsToAdd[validLabels[language]] = 1 - } - if (articleType === 'curriculum') { - labelsToAdd['status: need to test locally'] = 1; - } - }) - - /* this next section only adds needed labels which are NOT currently on the PR. */ - const newLabels = Object.keys(labelsToAdd).filter(label => !existingLabels.includes(label)); - if (newLabels.length) { - if (process.env.PRODUCTION_RUN === 'true') { - addLabels(number, newLabels); - } - await rateLimiter(+process.env.RATELIMIT_INTERVAL | 1500); - } - return newLabels; -}; - -module.exports = { labeler }; diff --git a/one-off-scripts/close-open-specific-failures.js b/one-off-scripts/close-open-specific-failures.js index 8671692b54..2423a1875e 100644 --- a/one-off-scripts/close-open-specific-failures.js +++ b/one-off-scripts/close-open-specific-failures.js @@ -29,16 +29,16 @@ const getUserInput = async () => { const lastPR = prs[prs.length - 1].number; log.setFirstLast({ firstPR, lastPR }); for (let { number, data: { errorDesc } } of prs) { - //if (errorDesc !== "unknown error") { + if (errorDesc !== "unknown error") { log.add(number, { closedOpened: true, errorDesc }); if (process.env.PRODUCTION_RUN === 'true') { await closeOpen(number); - await rateLimiter(2000); + await rateLimiter(120000); } - //} - //else { - // log.add(number, { closedOpened: false, errorDesc }); - //} + } + else { + log.add(number, { closedOpened: false, errorDesc }); + } } }) .then(() => { diff --git a/pr-tasks/close-open.js b/pr-tasks/close-open.js index 4a377cd80f..fae5b8150a 100644 --- a/pr-tasks/close-open.js +++ b/pr-tasks/close-open.js @@ -11,11 +11,11 @@ octokit.authenticate(octokitAuth); const closeOpen = async (number) => { const result = await octokit.pullRequests.update({ owner, repo , number, state: 'closed', base: 'master' }) .then(async () => { - await rateLimiter(10000); + await rateLimiter(5000); return octokit.pullRequests.update({ owner, repo , number, state: 'open', base: 'master' }) }) .then(async () => { - await rateLimiter(2000); + await rateLimiter(1000); await addComment(number, 'Closed and Reopened this PR to attempt to resolve a specific Travis build failure.'); }) .catch(async (err) => {