Skip to content

Commit 102c51e

Browse files
authored
Merge branch 'main' into Ex4ChatMasking
2 parents ca59e93 + 0051853 commit 102c51e

File tree

398 files changed

+16206
-8843
lines changed

Some content is hidden

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

398 files changed

+16206
-8843
lines changed

.eslintrc.changed.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ module.exports = {
1111
overrides: [
1212
{
1313
files: [
14-
'src/libs/ReportUtils.ts',
1514
'src/libs/actions/IOU.ts',
1615
'src/libs/actions/Report.ts',
1716
'src/libs/actions/Task.ts',
1817
'src/libs/OptionsListUtils.ts',
19-
'src/libs/ReportActionsUtils.ts',
2018
'src/libs/TransactionUtils/index.ts',
2119
'src/pages/home/ReportScreen.tsx',
2220
'src/pages/workspace/WorkspaceInitialPage.tsx',
21+
'src/pages/home/report/PureReportActionItem.tsx',
2322
],
2423
rules: {
2524
'rulesdir/no-default-id-values': 'off',

.github/actionlint.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ self-hosted-runner:
55
- macos-13-large
66
- macos-13-xlarge
77
- ubuntu-latest-reassure-tests
8+
- macos-12

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

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: Set up Node
22
description: Set up Node
33

4+
inputs:
5+
IS_HYBRID_BUILD:
6+
description: "Indicates if node is set up for hybrid app"
7+
required: false
8+
default: 'false'
9+
410
outputs:
511
cache-hit:
612
description: Was there a cache hit on the main node_modules?
@@ -27,14 +33,26 @@ runs:
2733
path: node_modules
2834
key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json', 'patches/**') }}
2935

36+
- id: cache-old-dot-node-modules
37+
if: inputs.IS_HYBRID_BUILD == 'true'
38+
uses: actions/cache@v4
39+
with:
40+
path: Mobile-Expensify/node_modules
41+
key: ${{ runner.os }}-node-modules-${{ hashFiles('Mobile-Expensify/package-lock.json', 'Mobile-Expensify/patches/**') }}
42+
3043
- id: cache-desktop-node-modules
3144
uses: actions/cache@v4
3245
with:
3346
path: desktop/node_modules
3447
key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json', 'desktop/patches/**') }}
3548

49+
- name: Remove ND node_modules if needed for hybrid app build
50+
if: inputs.IS_HYBRID_BUILD == 'true' && steps.cache-node-modules.outputs.cache-hit == 'true' && steps.cache-old-dot-node-modules.outputs.cache-hit != 'true'
51+
shell: bash
52+
run: rm -rf node_modules
53+
3654
- name: Install root project node packages
37-
if: steps.cache-node-modules.outputs.cache-hit != 'true'
55+
if: steps.cache-node-modules.outputs.cache-hit != 'true' || (inputs.IS_HYBRID_BUILD == 'true' && steps.cache-old-dot-node-modules.outputs.cache-hit != 'true')
3856
uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
3957
with:
4058
timeout_minutes: 30

0 commit comments

Comments
 (0)