fix: plfddf

.github/workflows/build-binaries.yml

@@ -45,6 +45,8 @@ jobs:
 
       - name: Setup & Build
         uses: ./actions/setup_and_build
+        with:
+          pkg_to_build: ${{ matrix.pkg_to_build }}
 
       - name: Lint Files
         # no need to lint files on all platforms
@@ -89,6 +91,8 @@ jobs:
 
       - name: Setup & Build
         uses: ./actions/setup_and_build
+        with:
+          pkg_to_build: 'windows_x64'
 
         # we want to test on all platforms are some are testing the menus rendered (and are depent on the platform)
       - name: Unit Test
@@ -130,6 +134,8 @@ jobs:
 
       - name: Setup & Build
         uses: ./actions/setup_and_build
+        with:
+          pkg_to_build: 'macos_x64'
 
         # we want to test on all platforms are some are testing the menus rendered (and are depent on the platform)
       - name: Unit Test

actions/setup_and_build/action.yml

@@ -1,5 +1,10 @@
 name: 'Setup and build'
 description: 'Setup and build Session Desktop'
+inputs:
+  pkg_to_build:
+    description: 'the package we are currently building (used as key for the cached node_modules)'
+    required: true
+
 runs:
   using: 'composite'
   steps:
@@ -12,14 +17,6 @@ runs:
       with:
         python-version: '3.11'
 
-    - name: Cache Desktop node_modules
-      id: cache-desktop-modules
-      uses: actions/cache@v3
-      if: runner.os != 'Windows'
-      with:
-        path: node_modules
-        key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
-
     # Not having this will break the windows build because the PATH won't be set by msbuild.
     - name: Add msbuild to PATH
       uses: microsoft/[email protected]
@@ -31,11 +28,24 @@ runs:
       run: |
         yarn global add node-gyp@latest
 
+    - uses: actions/cache/restore@v4
+      id: cache-desktop-modules
+      with:
+        path: node_modules
+        key: ${{ runner.os }}-${{ runner.arch }}-${{ inputs.pkg_to_build }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
+
     - name: Install dependencies
       shell: bash
       if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
       run: yarn install --frozen-lockfile --network-timeout 600000
 
+    - uses: actions/cache/save@v4
+      id: cache-desktop-modules
+      if: runner.os != 'Windows'
+      with:
+        path: node_modules
+        key: ${{ runner.os }}-${{ runner.arch }}-${{ inputs.pkg_to_build }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
+
     - name: Generate and concat files
       shell: bash
       run: yarn build-everything