Merge pull request #25988 from shubham1206agra/gh-action-fix

Fix the setupNode action failing on `npx patch-package`

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

@@ -16,38 +16,13 @@ runs:
       uses: actions/cache@v3
       with:
         path: node_modules
-        key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}
+        key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json', 'patches/**') }}
 
     - id: cache-desktop-node-modules
       uses: actions/cache@v3
       with:
         path: desktop/node_modules
-        key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json') }}
-
-    - name: Check if patch files changed
-      id: patchCheck
-      shell: bash
-      run: |
-        set -e
-        if [[ `git diff main --name-only | grep \.patch` != null ]]; then 
-          echo 'CHANGES_IN_PATCH_FILES=true' >> "$GITHUB_OUTPUT"
-        else 
-          echo 'CHANGES_IN_PATCH_FILES=false' >> "$GITHUB_OUTPUT"
-        fi
-
-    - name: Patch root project node packages
-      shell: bash
-      if: | 
-        steps.patchCheck.outputs.CHANGES_IN_PATCH_FILES == 'true' && 
-        steps.cache-node-modules.outputs.cache-hit == 'true'
-      run: npx patch-package
-
-    - name: Patch node packages for desktop submodule
-      shell: bash
-      if: | 
-        steps.patchCheck.outputs.CHANGES_IN_PATCH_FILES == 'true' && 
-        steps.cache-desktop-node-modules.outputs.cache-hit == 'true'
-      run: cd desktop && npx patch-package
+        key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json', 'desktop/patches/**') }}
 
     - name: Install root project node packages
       if: steps.cache-node-modules.outputs.cache-hit != 'true'