From 7fd0e94c63d39fb04fdbb97cca83ff14f4b1f64e Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 3 Jun 2024 10:34:08 -0500 Subject: [PATCH] uncomment mergefreze requests --- .../webhooks/receive-from-github.js | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/website/api/controllers/webhooks/receive-from-github.js b/website/api/controllers/webhooks/receive-from-github.js index 37b0bdc5719..4ef96c5eaa4 100644 --- a/website/api/controllers/webhooks/receive-from-github.js +++ b/website/api/controllers/webhooks/receive-from-github.js @@ -484,13 +484,12 @@ module.exports = { // ``` // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // FUTURE: reenable these requests when the bug that causes API requests to unfreeze the entire repo is resolved. - // await sails.helpers.http.post(`https://www.mergefreeze.com/api/branches/fleetdm/fleet/main?access_token=${encodeURIComponent(sails.config.custom.mergeFreezeAccessToken)}`, { - // user_name: 'fleet-release',//eslint-disable-line camelcase - // unblocked_prs: pocketOfPrNumbersUnfrozen,//eslint-disable-line camelcase - // }); - // // Update the Platform record to have the current unfrozen PR numbers - // await Platform.updateOne({id: platformRecord.id}).set({currentUnfrozenGitHubPrNumbers: pocketOfPrNumbersUnfrozen}); + await sails.helpers.http.post(`https://www.mergefreeze.com/api/branches/fleetdm/fleet/main?access_token=${encodeURIComponent(sails.config.custom.mergeFreezeAccessToken)}`, { + user_name: 'fleet-release',//eslint-disable-line camelcase + unblocked_prs: pocketOfPrNumbersUnfrozen,//eslint-disable-line camelcase + }); + // Update the Platform record to have the current unfrozen PR numbers + await Platform.updateOne({id: platformRecord.id}).set({currentUnfrozenGitHubPrNumbers: pocketOfPrNumbersUnfrozen}); }//fi } else { @@ -503,13 +502,12 @@ module.exports = { sails.log.verbose('#'+prNumber+' not autoapproved, main branch is frozen... prNumbers unfrozen:',pocketOfPrNumbersUnfrozen); // [?] See explanation above. - // FUTURE: reenable these requests when the bug that causes API requests to unfreeze the entire repo is resolved. - // await sails.helpers.http.post(`https://www.mergefreeze.com/api/branches/fleetdm/fleet/main?access_token=${encodeURIComponent(sails.config.custom.mergeFreezeAccessToken)}`, { - // user_name: 'fleet-release',//eslint-disable-line camelcase - // unblocked_prs: pocketOfPrNumbersUnfrozen,//eslint-disable-line camelcase - // }); - // // Update the Platform record to have the current unfrozen PR numbers - // await Platform.updateOne({id: platformRecord.id}).set({currentUnfrozenGitHubPrNumbers: pocketOfPrNumbersUnfrozen}); + await sails.helpers.http.post(`https://www.mergefreeze.com/api/branches/fleetdm/fleet/main?access_token=${encodeURIComponent(sails.config.custom.mergeFreezeAccessToken)}`, { + user_name: 'fleet-release',//eslint-disable-line camelcase + unblocked_prs: pocketOfPrNumbersUnfrozen,//eslint-disable-line camelcase + }); + // Update the Platform record to have the current unfrozen PR numbers + await Platform.updateOne({id: platformRecord.id}).set({currentUnfrozenGitHubPrNumbers: pocketOfPrNumbersUnfrozen}); }//fi // Is this in use?