Skip to content

Commit d2f44e1

Browse files
committed
Merge branch 'main' of github.com:Expensify/App into revert-68157-revert-67496-revert-67361-chuckdries/revert-66049
2 parents 148f547 + e49dbce commit d2f44e1

525 files changed

Lines changed: 46934 additions & 3785 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ help/_scripts/**
1717
modules/ExpensifyNitroUtils/nitrogen/**
1818
Mobile-Expensify/**
1919
vendor
20+
modules/group-ib-fp/**

.github/actions/javascript/authorChecklist/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15575,6 +15575,7 @@ const CONST = {
1557515575
LABELS: {
1557615576
STAGING_DEPLOY: 'StagingDeployCash',
1557715577
DEPLOY_BLOCKER: 'DeployBlockerCash',
15578+
LOCK_DEPLOY: '🔐 LockCashDeploys 🔐',
1557815579
INTERNAL_QA: 'InternalQA',
1557915580
HELP_WANTED: 'Help Wanted',
1558015581
CP_STAGING: 'CP Staging',
@@ -15908,12 +15909,9 @@ class GithubUtils {
1590815909
issueBody += `**Mobile-Expensify Changes:** https://github.com/${CONST_1.default.GITHUB_OWNER}/${CONST_1.default.MOBILE_EXPENSIFY_REPO}/compare/production...staging\r\n`;
1590915910
}
1591015911
issueBody += '\r\n';
15911-
// Warn deployers about potential bugs with the new process
15912-
issueBody +=
15913-
'> 💡 **Deployer FYI:** This checklist was generated using a new process. PR list from original method and detail logging can be found in the most recent [deploy workflow](https://github.com/Expensify/App/actions/workflows/deploy.yml) labeled `staging`, in the `createChecklist` action. Please tag @Julesssss with any issues.\r\n\r\n';
1591415912
// PR list
1591515913
if (sortedPRList.length > 0) {
15916-
issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
15914+
issueBody += '**This release contains changes from the following pull requests:**\r\n';
1591715915
sortedPRList.forEach((URL) => {
1591815916
issueBody += verifiedOrNoQAPRs.includes(URL) ? '- [x]' : '- [ ]';
1591915917
issueBody += ` ${URL}\r\n`;

.github/actions/javascript/awaitStagingDeploys/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12356,6 +12356,7 @@ const CONST = {
1235612356
LABELS: {
1235712357
STAGING_DEPLOY: 'StagingDeployCash',
1235812358
DEPLOY_BLOCKER: 'DeployBlockerCash',
12359+
LOCK_DEPLOY: '🔐 LockCashDeploys 🔐',
1235912360
INTERNAL_QA: 'InternalQA',
1236012361
HELP_WANTED: 'Help Wanted',
1236112362
CP_STAGING: 'CP Staging',
@@ -12689,12 +12690,9 @@ class GithubUtils {
1268912690
issueBody += `**Mobile-Expensify Changes:** https://github.com/${CONST_1.default.GITHUB_OWNER}/${CONST_1.default.MOBILE_EXPENSIFY_REPO}/compare/production...staging\r\n`;
1269012691
}
1269112692
issueBody += '\r\n';
12692-
// Warn deployers about potential bugs with the new process
12693-
issueBody +=
12694-
'> 💡 **Deployer FYI:** This checklist was generated using a new process. PR list from original method and detail logging can be found in the most recent [deploy workflow](https://github.com/Expensify/App/actions/workflows/deploy.yml) labeled `staging`, in the `createChecklist` action. Please tag @Julesssss with any issues.\r\n\r\n';
1269512693
// PR list
1269612694
if (sortedPRList.length > 0) {
12697-
issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
12695+
issueBody += '**This release contains changes from the following pull requests:**\r\n';
1269812696
sortedPRList.forEach((URL) => {
1269912697
issueBody += verifiedOrNoQAPRs.includes(URL) ? '- [x]' : '- [ ]';
1270012698
issueBody += ` ${URL}\r\n`;

.github/actions/javascript/checkAndroidStatus/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -737059,6 +737059,7 @@ const CONST = {
737059737059
LABELS: {
737060737060
STAGING_DEPLOY: 'StagingDeployCash',
737061737061
DEPLOY_BLOCKER: 'DeployBlockerCash',
737062+
LOCK_DEPLOY: '🔐 LockCashDeploys 🔐',
737062737063
INTERNAL_QA: 'InternalQA',
737063737064
HELP_WANTED: 'Help Wanted',
737064737065
CP_STAGING: 'CP Staging',
@@ -737392,12 +737393,9 @@ class GithubUtils {
737392737393
issueBody += `**Mobile-Expensify Changes:** https://github.com/${CONST_1.default.GITHUB_OWNER}/${CONST_1.default.MOBILE_EXPENSIFY_REPO}/compare/production...staging\r\n`;
737393737394
}
737394737395
issueBody += '\r\n';
737395-
// Warn deployers about potential bugs with the new process
737396-
issueBody +=
737397-
'> 💡 **Deployer FYI:** This checklist was generated using a new process. PR list from original method and detail logging can be found in the most recent [deploy workflow](https://github.com/Expensify/App/actions/workflows/deploy.yml) labeled `staging`, in the `createChecklist` action. Please tag @Julesssss with any issues.\r\n\r\n';
737398737396
// PR list
737399737397
if (sortedPRList.length > 0) {
737400-
issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
737398+
issueBody += '**This release contains changes from the following pull requests:**\r\n';
737401737399
sortedPRList.forEach((URL) => {
737402737400
issueBody += verifiedOrNoQAPRs.includes(URL) ? '- [x]' : '- [ ]';
737403737401
issueBody += ` ${URL}\r\n`;

.github/actions/javascript/checkDeployBlockers/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11623,6 +11623,7 @@ const CONST = {
1162311623
LABELS: {
1162411624
STAGING_DEPLOY: 'StagingDeployCash',
1162511625
DEPLOY_BLOCKER: 'DeployBlockerCash',
11626+
LOCK_DEPLOY: '🔐 LockCashDeploys 🔐',
1162611627
INTERNAL_QA: 'InternalQA',
1162711628
HELP_WANTED: 'Help Wanted',
1162811629
CP_STAGING: 'CP Staging',
@@ -11956,12 +11957,9 @@ class GithubUtils {
1195611957
issueBody += `**Mobile-Expensify Changes:** https://github.com/${CONST_1.default.GITHUB_OWNER}/${CONST_1.default.MOBILE_EXPENSIFY_REPO}/compare/production...staging\r\n`;
1195711958
}
1195811959
issueBody += '\r\n';
11959-
// Warn deployers about potential bugs with the new process
11960-
issueBody +=
11961-
'> 💡 **Deployer FYI:** This checklist was generated using a new process. PR list from original method and detail logging can be found in the most recent [deploy workflow](https://github.com/Expensify/App/actions/workflows/deploy.yml) labeled `staging`, in the `createChecklist` action. Please tag @Julesssss with any issues.\r\n\r\n';
1196211960
// PR list
1196311961
if (sortedPRList.length > 0) {
11964-
issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
11962+
issueBody += '**This release contains changes from the following pull requests:**\r\n';
1196511963
sortedPRList.forEach((URL) => {
1196611964
issueBody += verifiedOrNoQAPRs.includes(URL) ? '- [x]' : '- [ ]';
1196711965
issueBody += ` ${URL}\r\n`;

.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ async function run(): Promise<IssuesCreateResponse | void> {
210210
const {data: newChecklist} = await GithubUtils.octokit.issues.create({
211211
...defaultPayload,
212212
title: `Deploy Checklist: New Expensify ${format(new Date(), CONST.DATE_FORMAT_STRING)}`,
213-
labels: [CONST.LABELS.STAGING_DEPLOY],
213+
labels: [CONST.LABELS.STAGING_DEPLOY, CONST.LABELS.LOCK_DEPLOY],
214214
assignees: [CONST.APPLAUSE_BOT as string].concat(checklistAssignees),
215215
});
216216
console.log(`Successfully created new StagingDeployCash! 🎉 ${newChecklist.html_url}`);

.github/actions/javascript/createOrUpdateStagingDeploy/index.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11705,7 +11705,7 @@ async function run() {
1170511705
const { data: newChecklist } = await GithubUtils_1.default.octokit.issues.create({
1170611706
...defaultPayload,
1170711707
title: `Deploy Checklist: New Expensify ${(0, format_1.format)(new Date(), CONST_1.default.DATE_FORMAT_STRING)}`,
11708-
labels: [CONST_1.default.LABELS.STAGING_DEPLOY],
11708+
labels: [CONST_1.default.LABELS.STAGING_DEPLOY, CONST_1.default.LABELS.LOCK_DEPLOY],
1170911709
assignees: [CONST_1.default.APPLAUSE_BOT].concat(checklistAssignees),
1171011710
});
1171111711
console.log(`Successfully created new StagingDeployCash! 🎉 ${newChecklist.html_url}`);
@@ -11751,6 +11751,7 @@ const CONST = {
1175111751
LABELS: {
1175211752
STAGING_DEPLOY: 'StagingDeployCash',
1175311753
DEPLOY_BLOCKER: 'DeployBlockerCash',
11754+
LOCK_DEPLOY: '🔐 LockCashDeploys 🔐',
1175411755
INTERNAL_QA: 'InternalQA',
1175511756
HELP_WANTED: 'Help Wanted',
1175611757
CP_STAGING: 'CP Staging',
@@ -12243,12 +12244,9 @@ class GithubUtils {
1224312244
issueBody += `**Mobile-Expensify Changes:** https://github.com/${CONST_1.default.GITHUB_OWNER}/${CONST_1.default.MOBILE_EXPENSIFY_REPO}/compare/production...staging\r\n`;
1224412245
}
1224512246
issueBody += '\r\n';
12246-
// Warn deployers about potential bugs with the new process
12247-
issueBody +=
12248-
'> 💡 **Deployer FYI:** This checklist was generated using a new process. PR list from original method and detail logging can be found in the most recent [deploy workflow](https://github.com/Expensify/App/actions/workflows/deploy.yml) labeled `staging`, in the `createChecklist` action. Please tag @Julesssss with any issues.\r\n\r\n';
1224912247
// PR list
1225012248
if (sortedPRList.length > 0) {
12251-
issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
12249+
issueBody += '**This release contains changes from the following pull requests:**\r\n';
1225212250
sortedPRList.forEach((URL) => {
1225312251
issueBody += verifiedOrNoQAPRs.includes(URL) ? '- [x]' : '- [ ]';
1225412252
issueBody += ` ${URL}\r\n`;

.github/actions/javascript/getArtifactInfo/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11584,6 +11584,7 @@ const CONST = {
1158411584
LABELS: {
1158511585
STAGING_DEPLOY: 'StagingDeployCash',
1158611586
DEPLOY_BLOCKER: 'DeployBlockerCash',
11587+
LOCK_DEPLOY: '🔐 LockCashDeploys 🔐',
1158711588
INTERNAL_QA: 'InternalQA',
1158811589
HELP_WANTED: 'Help Wanted',
1158911590
CP_STAGING: 'CP Staging',
@@ -11917,12 +11918,9 @@ class GithubUtils {
1191711918
issueBody += `**Mobile-Expensify Changes:** https://github.com/${CONST_1.default.GITHUB_OWNER}/${CONST_1.default.MOBILE_EXPENSIFY_REPO}/compare/production...staging\r\n`;
1191811919
}
1191911920
issueBody += '\r\n';
11920-
// Warn deployers about potential bugs with the new process
11921-
issueBody +=
11922-
'> 💡 **Deployer FYI:** This checklist was generated using a new process. PR list from original method and detail logging can be found in the most recent [deploy workflow](https://github.com/Expensify/App/actions/workflows/deploy.yml) labeled `staging`, in the `createChecklist` action. Please tag @Julesssss with any issues.\r\n\r\n';
1192311921
// PR list
1192411922
if (sortedPRList.length > 0) {
11925-
issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
11923+
issueBody += '**This release contains changes from the following pull requests:**\r\n';
1192611924
sortedPRList.forEach((URL) => {
1192711925
issueBody += verifiedOrNoQAPRs.includes(URL) ? '- [x]' : '- [ ]';
1192811926
issueBody += ` ${URL}\r\n`;

.github/actions/javascript/getDeployPullRequestList/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11770,6 +11770,7 @@ const CONST = {
1177011770
LABELS: {
1177111771
STAGING_DEPLOY: 'StagingDeployCash',
1177211772
DEPLOY_BLOCKER: 'DeployBlockerCash',
11773+
LOCK_DEPLOY: '🔐 LockCashDeploys 🔐',
1177311774
INTERNAL_QA: 'InternalQA',
1177411775
HELP_WANTED: 'Help Wanted',
1177511776
CP_STAGING: 'CP Staging',
@@ -12262,12 +12263,9 @@ class GithubUtils {
1226212263
issueBody += `**Mobile-Expensify Changes:** https://github.com/${CONST_1.default.GITHUB_OWNER}/${CONST_1.default.MOBILE_EXPENSIFY_REPO}/compare/production...staging\r\n`;
1226312264
}
1226412265
issueBody += '\r\n';
12265-
// Warn deployers about potential bugs with the new process
12266-
issueBody +=
12267-
'> 💡 **Deployer FYI:** This checklist was generated using a new process. PR list from original method and detail logging can be found in the most recent [deploy workflow](https://github.com/Expensify/App/actions/workflows/deploy.yml) labeled `staging`, in the `createChecklist` action. Please tag @Julesssss with any issues.\r\n\r\n';
1226812266
// PR list
1226912267
if (sortedPRList.length > 0) {
12270-
issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
12268+
issueBody += '**This release contains changes from the following pull requests:**\r\n';
1227112269
sortedPRList.forEach((URL) => {
1227212270
issueBody += verifiedOrNoQAPRs.includes(URL) ? '- [x]' : '- [ ]';
1227312271
issueBody += ` ${URL}\r\n`;

.github/actions/javascript/getPreviousVersion/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11581,6 +11581,7 @@ const CONST = {
1158111581
LABELS: {
1158211582
STAGING_DEPLOY: 'StagingDeployCash',
1158311583
DEPLOY_BLOCKER: 'DeployBlockerCash',
11584+
LOCK_DEPLOY: '🔐 LockCashDeploys 🔐',
1158411585
INTERNAL_QA: 'InternalQA',
1158511586
HELP_WANTED: 'Help Wanted',
1158611587
CP_STAGING: 'CP Staging',
@@ -12073,12 +12074,9 @@ class GithubUtils {
1207312074
issueBody += `**Mobile-Expensify Changes:** https://github.com/${CONST_1.default.GITHUB_OWNER}/${CONST_1.default.MOBILE_EXPENSIFY_REPO}/compare/production...staging\r\n`;
1207412075
}
1207512076
issueBody += '\r\n';
12076-
// Warn deployers about potential bugs with the new process
12077-
issueBody +=
12078-
'> 💡 **Deployer FYI:** This checklist was generated using a new process. PR list from original method and detail logging can be found in the most recent [deploy workflow](https://github.com/Expensify/App/actions/workflows/deploy.yml) labeled `staging`, in the `createChecklist` action. Please tag @Julesssss with any issues.\r\n\r\n';
1207912077
// PR list
1208012078
if (sortedPRList.length > 0) {
12081-
issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
12079+
issueBody += '**This release contains changes from the following pull requests:**\r\n';
1208212080
sortedPRList.forEach((URL) => {
1208312081
issueBody += verifiedOrNoQAPRs.includes(URL) ? '- [x]' : '- [ ]';
1208412082
issueBody += ` ${URL}\r\n`;

0 commit comments

Comments
 (0)