Skip to content

Commit fe2c821

Browse files
authored
Merge pull request #56271 from Expensify/revert-56161-jnowakow/install-desktop-node-modules-only-when-necessary
Revert "[No QA] Install desktop node-modules only when building desktop app"
2 parents 15bcf6f + 6ad6a6d commit fe2c821

File tree

3 files changed

+1
-10
lines changed

3 files changed

+1
-10
lines changed

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

+1-6
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:
@@ -45,7 +41,6 @@ runs:
4541
key: ${{ runner.os }}-node-modules-${{ hashFiles('Mobile-Expensify/package-lock.json', 'Mobile-Expensify/patches/**') }}
4642

4743
- id: cache-desktop-node-modules
48-
if: inputs.IS_DESKTOP_BUILD == 'true'
4944
uses: actions/cache@v4
5045
with:
5146
path: desktop/node_modules
@@ -65,7 +60,7 @@ runs:
6560
command: npm ci
6661

6762
- name: Install node packages for desktop submodule
68-
if: inputs.IS_DESKTOP_BUILD == 'true' && steps.cache-desktop-node-modules.outputs.cache-hit != 'true'
63+
if: steps.cache-desktop-node-modules.outputs.cache-hit != 'true'
6964
uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
7065
with:
7166
timeout_minutes: 30

.github/workflows/deploy.yml

-2
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,6 @@ jobs:
301301

302302
- name: Setup Node
303303
uses: ./.github/actions/composite/setupNode
304-
with:
305-
IS_DESKTOP_BUILD: true
306304

307305
- name: Decrypt Developer ID Certificate
308306
run: cd desktop && gpg --quiet --batch --yes --decrypt --passphrase="$DEVELOPER_ID_SECRET_PASSPHRASE" --output developer_id.p12 developer_id.p12.gpg

.github/workflows/testBuild.yml

-2
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,6 @@ jobs:
247247
248248
- name: Setup Node
249249
uses: ./.github/actions/composite/setupNode
250-
with:
251-
IS_DESKTOP_BUILD: true
252250

253251
- name: Decrypt Developer ID Certificate
254252
run: cd desktop && gpg --quiet --batch --yes --decrypt --passphrase="$DEVELOPER_ID_SECRET_PASSPHRASE" --output developer_id.p12 developer_id.p12.gpg

0 commit comments

Comments
 (0)