@@ -11462,7 +11462,10 @@ const GitUtils_1 = __importDefault(__nccwpck_require__(1547));
11462
11462
async function run() {
11463
11463
// Note: require('package.json').version does not work because ncc will resolve that to a plain string at compile time
11464
11464
const packageJson = JSON.parse(fs_1.default.readFileSync('package.json', 'utf8'));
11465
- const newVersionTag = packageJson.version;
11465
+ // The checklist will use the package.json version, e.g. '1.2.3-4'
11466
+ const newVersion = packageJson.version;
11467
+ // The staging tag will use the package.json version with a '-staging' suffix, e.g. '1.2.3-4-staging'
11468
+ const newStagingTag = `${packageJson.version}-staging`;
11466
11469
try {
11467
11470
// Start by fetching the list of recent StagingDeployCash issues, along with the list of open deploy blockers
11468
11471
const { data: recentDeployChecklists } = await GithubUtils_1.default.octokit.issues.listForRepo({
@@ -11493,12 +11496,12 @@ async function run() {
11493
11496
const previousChecklistData = GithubUtils_1.default.getStagingDeployCashData(previousChecklist);
11494
11497
const currentChecklistData = shouldCreateNewDeployChecklist ? undefined : GithubUtils_1.default.getStagingDeployCashData(mostRecentChecklist);
11495
11498
// Find the list of PRs merged between the current checklist and the previous checklist
11496
- const mergedPRs = await GitUtils_1.default.getPullRequestsMergedBetween(previousChecklistData.tag ?? '', newVersionTag );
11499
+ const mergedPRs = await GitUtils_1.default.getPullRequestsMergedBetween(previousChecklistData.version ?? '', newStagingTag );
11497
11500
// Next, we generate the checklist body
11498
11501
let checklistBody = '';
11499
11502
let checklistAssignees = [];
11500
11503
if (shouldCreateNewDeployChecklist) {
11501
- const stagingDeployCashBodyAndAssignees = await GithubUtils_1.default.generateStagingDeployCashBodyAndAssignees(newVersionTag , mergedPRs.map((value) => GithubUtils_1.default.getPullRequestURLFromNumber(value)));
11504
+ const stagingDeployCashBodyAndAssignees = await GithubUtils_1.default.generateStagingDeployCashBodyAndAssignees(newVersion , mergedPRs.map((value) => GithubUtils_1.default.getPullRequestURLFromNumber(value)));
11502
11505
if (stagingDeployCashBodyAndAssignees) {
11503
11506
checklistBody = stagingDeployCashBodyAndAssignees.issueBody;
11504
11507
checklistAssignees = stagingDeployCashBodyAndAssignees.issueAssignees.filter(Boolean);
@@ -11540,8 +11543,8 @@ async function run() {
11540
11543
isResolved,
11541
11544
});
11542
11545
});
11543
- const didVersionChange = newVersionTag !== currentChecklistData?.tag ;
11544
- const stagingDeployCashBodyAndAssignees = await GithubUtils_1.default.generateStagingDeployCashBodyAndAssignees(newVersionTag , PRList.map((pr) => pr.url), PRList.filter((pr) => pr.isVerified).map((pr) => pr.url), deployBlockers.map((blocker) => blocker.url), deployBlockers.filter((blocker) => blocker.isResolved).map((blocker) => blocker.url), currentChecklistData?.internalQAPRList.filter((pr) => pr.isResolved).map((pr) => pr.url), didVersionChange ? false : currentChecklistData.isTimingDashboardChecked, didVersionChange ? false : currentChecklistData.isFirebaseChecked, didVersionChange ? false : currentChecklistData.isGHStatusChecked);
11546
+ const didVersionChange = newVersion !== currentChecklistData?.version ;
11547
+ const stagingDeployCashBodyAndAssignees = await GithubUtils_1.default.generateStagingDeployCashBodyAndAssignees(newVersion , PRList.map((pr) => pr.url), PRList.filter((pr) => pr.isVerified).map((pr) => pr.url), deployBlockers.map((blocker) => blocker.url), deployBlockers.filter((blocker) => blocker.isResolved).map((blocker) => blocker.url), currentChecklistData?.internalQAPRList.filter((pr) => pr.isResolved).map((pr) => pr.url), didVersionChange ? false : currentChecklistData.isTimingDashboardChecked, didVersionChange ? false : currentChecklistData.isFirebaseChecked, didVersionChange ? false : currentChecklistData.isGHStatusChecked);
11545
11548
if (stagingDeployCashBodyAndAssignees) {
11546
11549
checklistBody = stagingDeployCashBodyAndAssignees.issueBody;
11547
11550
checklistAssignees = stagingDeployCashBodyAndAssignees.issueAssignees.filter(Boolean);
@@ -11984,7 +11987,7 @@ class GithubUtils {
11984
11987
static getStagingDeployCashData(issue) {
11985
11988
try {
11986
11989
const versionRegex = new RegExp('([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9]+))?', 'g');
11987
- const tag = issue.body?.match(versionRegex)?.[0].replace(/`/g, '');
11990
+ const version = issue.body?.match(versionRegex)?.[0].replace(/`/g, '');
11988
11991
return {
11989
11992
title: issue.title,
11990
11993
url: issue.url,
@@ -11996,7 +11999,7 @@ class GithubUtils {
11996
11999
isTimingDashboardChecked: issue.body ? /-\s\[x]\sI checked the \[App Timing Dashboard]/.test(issue.body) : false,
11997
12000
isFirebaseChecked: issue.body ? /-\s\[x]\sI checked \[Firebase Crashlytics]/.test(issue.body) : false,
11998
12001
isGHStatusChecked: issue.body ? /-\s\[x]\sI checked \[GitHub Status]/.test(issue.body) : false,
11999
- tag ,
12002
+ version ,
12000
12003
};
12001
12004
}
12002
12005
catch (exception) {
0 commit comments