Merge remote-tracking branch 'origin/main' into feature/bump-onyx-to-…

…2.0.92

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

@@ -6,10 +6,6 @@ inputs:
     description: "Indicates if node is set up for hybrid app"
     required: false
     default: 'false'
-  IS_DESKTOP_BUILD:
-    description: "Indicates if node is set up for desktop app"
-    required: false
-    default: 'false'
 
 outputs:
   cache-hit:
@@ -45,7 +41,6 @@ runs:
         key: ${{ runner.os }}-node-modules-${{ hashFiles('Mobile-Expensify/package-lock.json', 'Mobile-Expensify/patches/**') }}
 
     - id: cache-desktop-node-modules
-      if: inputs.IS_DESKTOP_BUILD == 'true'
       uses: actions/cache@v4
       with:
         path: desktop/node_modules
@@ -65,7 +60,7 @@ runs:
         command: npm ci
 
     - name: Install node packages for desktop submodule
-      if: inputs.IS_DESKTOP_BUILD == 'true' && steps.cache-desktop-node-modules.outputs.cache-hit != 'true'
+      if: steps.cache-desktop-node-modules.outputs.cache-hit != 'true'
       uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
       with:
         timeout_minutes: 30

.github/workflows/deploy.yml

@@ -301,8 +301,6 @@ jobs:
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
-        with:
-          IS_DESKTOP_BUILD: true
 
       - name: Decrypt Developer ID Certificate
         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

@@ -247,8 +247,6 @@ jobs:
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
-        with:
-          IS_DESKTOP_BUILD: true
 
       - name: Decrypt Developer ID Certificate
         run: cd desktop && gpg --quiet --batch --yes --decrypt --passphrase="$DEVELOPER_ID_SECRET_PASSPHRASE" --output developer_id.p12 developer_id.p12.gpg