Skip to content

Website: uncomment MergeFreeze requests in GitHub webhook #19449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eashaw merged 1 commit into from
Jun 3, 2024
Merged

Website: uncomment MergeFreeze requests in GitHub webhook #19449

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions website/api/controllers/webhooks/receive-from-github.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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?
Expand Down