diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js index be5cd67b490f..701a9bca70a7 100644 --- a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js +++ b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js @@ -77,6 +77,8 @@ async function run() { repo: CONST.APP_REPO, labels: CONST.LABELS.DEPLOY_BLOCKER, }); + + // First, make sure we include all current deploy blockers const deployBlockers = _.reduce( openDeployBlockers, (memo, deployBlocker) => { @@ -93,6 +95,15 @@ async function run() { [], ); + // Then make sure we include any demoted or closed blockers as well, and just check them off automatically + for (const deployBlocker of currentChecklistData.deployBlockers) { + const isResolved = _.findIndex(deployBlockers, (openBlocker) => openBlocker.number === deployBlocker.number) < 0; + deployBlockers.push({ + ...deployBlocker, + isResolved, + }); + } + const didVersionChange = newVersion ? newVersion !== currentChecklistData.tag : false; checklistBody = await GithubUtils.generateStagingDeployCashBody( newTag,