Skip to content

Commit 085a9c3

Browse files
allgandalfallgandalf
authored
Merge branch 'Expensify:main' into allowAddingFeedForCollectCSV
2 parents 300a815 + 566a084 commit 085a9c3

166 files changed

Lines changed: 4647 additions & 2082 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.

‎.github/ISSUE_TEMPLATE/Performance.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ Select the officially supported platforms where the issue was reproduced:
3232
- [ ] iOS: mWeb Chrome
3333
- [ ] Windows: Chrome
3434
- [ ] MacOS: Chrome / Safari
35-
- [ ] MacOS: Desktop
3635

3736
<details>
3837
<summary>Platforms Tested:</summary>
@@ -45,7 +44,6 @@ On which of our officially supported platforms was this issue tested:
4544
- [ ] iOS: mWeb Chrome
4645
- [ ] Windows: Chrome
4746
- [ ] MacOS: Chrome / Safari
48-
- [ ] MacOS: Desktop
4947

5048
</details>
5149

‎.github/actions/composite/setupNode/action.yml‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ inputs:
66
description: "Indicates if node is set up for hybrid app"
77
required: false
88
default: 'false'
9-
IS_DESKTOP_BUILD:
10-
description: "Indicates if node is set up for desktop app"
11-
required: false
12-
default: 'false'
139

1410
outputs:
1511
cache-hit:
@@ -27,9 +23,7 @@ runs:
2723
with:
2824
node-version-file: '.nvmrc'
2925
cache: npm
30-
cache-dependency-path: |
31-
normalized-package-lock.json
32-
desktop/package-lock.json
26+
cache-dependency-path: normalized-package-lock.json
3327

3428
- id: cache-node-modules
3529
# v4
@@ -46,14 +40,6 @@ runs:
4640
path: Mobile-Expensify/node_modules
4741
key: ${{ runner.os }}-node-modules-${{ hashFiles('Mobile-Expensify/package-lock.json', 'Mobile-Expensify/patches/**') }}
4842

49-
- id: cache-desktop-node-modules
50-
if: inputs.IS_DESKTOP_BUILD == 'true'
51-
# v4
52-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
53-
with:
54-
path: desktop/node_modules
55-
key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json', 'desktop/patches/**') }}
56-
5743
- name: Remove ND node_modules if needed for hybrid app build
5844
if: inputs.IS_HYBRID_BUILD == 'true' && steps.cache-node-modules.outputs.cache-hit == 'true' && steps.cache-old-dot-node-modules.outputs.cache-hit != 'true'
5945
shell: bash
@@ -65,12 +51,4 @@ runs:
6551
with:
6652
timeout_minutes: 30
6753
max_attempts: 3
68-
command: npm ci
69-
70-
- name: Install node packages for desktop submodule
71-
if: inputs.IS_DESKTOP_BUILD == 'true' && steps.cache-desktop-node-modules.outputs.cache-hit != 'true'
72-
uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
73-
with:
74-
timeout_minutes: 30
75-
max_attempts: 3
76-
command: cd desktop && npm ci
54+
command: npm ci

‎.github/actions/javascript/markPullRequestsAsDeployed/action.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ inputs:
2020
ANDROID:
2121
description: "Android job result ('success', 'failure', 'cancelled', or 'skipped')"
2222
required: true
23-
DESKTOP:
24-
description: "Desktop job result ('success', 'failure', 'cancelled', or 'skipped')"
25-
required: true
2623
IOS:
2724
description: "iOS job result ('success', 'failure', 'cancelled', or 'skipped')"
2825
required: true

‎.github/actions/javascript/markPullRequestsAsDeployed/index.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12840,7 +12840,6 @@ async function run() {
1284012840
const isProd = ActionUtils.getJSONInput('IS_PRODUCTION_DEPLOY', { required: true });
1284112841
const version = core.getInput('DEPLOY_VERSION', { required: true });
1284212842
const androidResult = getDeployTableMessage(core.getInput('ANDROID', { required: true }));
12843-
const desktopResult = getDeployTableMessage(core.getInput('DESKTOP', { required: true }));
1284412843
const iOSResult = getDeployTableMessage(core.getInput('IOS', { required: true }));
1284512844
const webResult = getDeployTableMessage(core.getInput('WEB', { required: true }));
1284612845
const date = core.getInput('DATE');
@@ -12852,7 +12851,7 @@ async function run() {
1285212851
message += `on ${date}`;
1285312852
}
1285412853
message += `🚀`;
12855-
message += `\n\nplatform | result\n---|---\n🖥 desktop 🖥|${desktopResult}`;
12854+
message += `\n\nplatform | result\n---|---`;
1285612855
message += `\n🕸 web 🕸|${webResult}`;
1285712856
message += `\n🤖 android 🤖|${androidResult}\n🍎 iOS 🍎|${iOSResult}`;
1285812857
if (note) {

‎.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ async function run() {
103103
const version = core.getInput('DEPLOY_VERSION', {required: true});
104104

105105
const androidResult = getDeployTableMessage(core.getInput('ANDROID', {required: true}) as PlatformResult);
106-
const desktopResult = getDeployTableMessage(core.getInput('DESKTOP', {required: true}) as PlatformResult);
107106
const iOSResult = getDeployTableMessage(core.getInput('IOS', {required: true}) as PlatformResult);
108107
const webResult = getDeployTableMessage(core.getInput('WEB', {required: true}) as PlatformResult);
109108

@@ -117,7 +116,7 @@ async function run() {
117116
message += `on ${date}`;
118117
}
119118
message += `🚀`;
120-
message += `\n\nplatform | result\n---|---\n🖥 desktop 🖥|${desktopResult}`;
119+
message += `\n\nplatform | result\n---|---`;
121120
message += `\n🕸 web 🕸|${webResult}`;
122121
message += `\n🤖 android 🤖|${androidResult}\n🍎 iOS 🍎|${iOSResult}`;
123122

‎.github/actions/javascript/postTestBuildComment/action.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ inputs:
1616
ANDROID:
1717
description: "Android job result ('success', 'failure', 'cancelled', or 'skipped')"
1818
required: false
19-
DESKTOP:
20-
description: "Desktop job result ('success', 'failure', 'cancelled', or 'skipped')"
21-
required: false
2219
IOS:
2320
description: "iOS job result ('success', 'failure', 'cancelled', or 'skipped')"
2421
required: false
@@ -28,9 +25,6 @@ inputs:
2825
ANDROID_LINK:
2926
description: "Link for the Android build"
3027
required: false
31-
DESKTOP_LINK:
32-
description: "Link for the desktop build"
33-
required: false
3428
IOS_LINK:
3529
description: "Link for the iOS build"
3630
required: false

‎.github/actions/javascript/postTestBuildComment/index.js‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11585,12 +11585,11 @@ const github_1 = __nccwpck_require__(5438);
1158511585
const CONST_1 = __importDefault(__nccwpck_require__(9873));
1158611586
const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
1158711587
function getTestBuildMessage(appPr, mobileExpensifyPr) {
11588-
const inputs = ['ANDROID', 'DESKTOP', 'IOS', 'WEB'];
11588+
const inputs = ['ANDROID', 'IOS', 'WEB'];
1158911589
const names = {
1159011590
[inputs[0]]: 'Android',
11591-
[inputs[1]]: 'Desktop',
11592-
[inputs[2]]: 'iOS',
11593-
[inputs[3]]: 'Web',
11591+
[inputs[1]]: 'iOS',
11592+
[inputs[2]]: 'Web',
1159411593
};
1159511594
const result = inputs.reduce((acc, platform) => {
1159611595
const input = core.getInput(platform, { required: false });
@@ -11619,17 +11618,17 @@ function getTestBuildMessage(appPr, mobileExpensifyPr) {
1161911618
};
1162011619
return acc;
1162111620
}, {});
11622-
const message = `:test_tube::test_tube: Use the links below to test this adhoc build on Android, iOS${appPr ? ', Desktop, and Web' : ''}. Happy testing! :test_tube::test_tube:
11621+
const message = `:test_tube::test_tube: Use the links below to test this adhoc build on Android, iOS${appPr ? ', and Web' : ''}. Happy testing! :test_tube::test_tube:
1162311622
Built from${appPr ? ` App PR Expensify/App#${appPr}` : ''}${mobileExpensifyPr ? ` Mobile-Expensify PR Expensify/Mobile-Expensify#${mobileExpensifyPr}` : ''}.
1162411623
| Android :robot: | iOS :apple: |
1162511624
| ------------- | ------------- |
1162611625
| ${result.ANDROID.link} | ${result.IOS.link} |
1162711626
| ${result.ANDROID.qrCode} | ${result.IOS.qrCode} |
1162811627

11629-
| Desktop :computer: | Web :spider_web: |
11630-
| ------------- | ------------- |
11631-
| ${result.DESKTOP.link} | ${result.WEB.link} |
11632-
| ${result.DESKTOP.qrCode} | ${result.WEB.qrCode} |
11628+
| Web :spider_web: |
11629+
| ------------- |
11630+
| ${result.WEB.link} |
11631+
| ${result.WEB.qrCode} |
1163311632

1163411633
---
1163511634

‎.github/actions/javascript/postTestBuildComment/postTestBuildComment.ts‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ import CONST from '@github/libs/CONST';
55
import GithubUtils from '@github/libs/GithubUtils';
66

77
function getTestBuildMessage(appPr?: number, mobileExpensifyPr?: number): string {
8-
const inputs = ['ANDROID', 'DESKTOP', 'IOS', 'WEB'] as const;
8+
const inputs = ['ANDROID', 'IOS', 'WEB'] as const;
99
const names = {
1010
[inputs[0]]: 'Android',
11-
[inputs[1]]: 'Desktop',
12-
[inputs[2]]: 'iOS',
13-
[inputs[3]]: 'Web',
11+
[inputs[1]]: 'iOS',
12+
[inputs[2]]: 'Web',
1413
};
1514

1615
const result = inputs.reduce(
@@ -47,17 +46,17 @@ function getTestBuildMessage(appPr?: number, mobileExpensifyPr?: number): string
4746
{} as Record<TupleToUnion<typeof inputs>, {link: string; qrCode: string}>,
4847
);
4948

50-
const message = `:test_tube::test_tube: Use the links below to test this adhoc build on Android, iOS${appPr ? ', Desktop, and Web' : ''}. Happy testing! :test_tube::test_tube:
49+
const message = `:test_tube::test_tube: Use the links below to test this adhoc build on Android, iOS${appPr ? ', and Web' : ''}. Happy testing! :test_tube::test_tube:
5150
Built from${appPr ? ` App PR Expensify/App#${appPr}` : ''}${mobileExpensifyPr ? ` Mobile-Expensify PR Expensify/Mobile-Expensify#${mobileExpensifyPr}` : ''}.
5251
| Android :robot: | iOS :apple: |
5352
| ------------- | ------------- |
5453
| ${result.ANDROID.link} | ${result.IOS.link} |
5554
| ${result.ANDROID.qrCode} | ${result.IOS.qrCode} |
5655
57-
| Desktop :computer: | Web :spider_web: |
58-
| ------------- | ------------- |
59-
| ${result.DESKTOP.link} | ${result.WEB.link} |
60-
| ${result.DESKTOP.qrCode} | ${result.WEB.qrCode} |
56+
| Web :spider_web: |
57+
| ------------- |
58+
| ${result.WEB.link} |
59+
| ${result.WEB.qrCode} |
6160
6261
---
6362

‎.github/workflows/checkE2ETestCode.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ jobs:
1919

2020
- name: Setup Node
2121
uses: ./.github/actions/composite/setupNode
22-
with:
23-
IS_DESKTOP_BUILD: 'true'
2422

2523
- name: Verify e2e tests compile correctly
2624
run: npm run e2e-test-runner-build

‎.github/workflows/checkSVGCompression.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ jobs:
2626

2727
- name: Setup Node
2828
uses: ./.github/actions/composite/setupNode
29-
with:
30-
IS_DESKTOP_BUILD: true
3129

3230
- name: Compress SVG check
3331
uses: ./.github/actions/javascript/checkSVGCompression

0 commit comments

Comments
 (0)