From f82279094bed5dc3c874a31588b3075cf213ceb5 Mon Sep 17 00:00:00 2001
From: Vince Grassia <593223+vgrassia@users.noreply.github.com>
Date: Mon, 9 May 2022 11:22:14 -0400
Subject: [PATCH] Fix Build Desktop Workflow (#2666)

---
 .github/workflows/build-desktop.yml | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index 71323722c7..3e7e418aed 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -14,7 +14,6 @@ on:
 defaults:
   run:
     shell: bash
-    working-directory: apps/desktop
 
 jobs:
   cloc:
@@ -41,6 +40,9 @@ jobs:
       build_number: ${{ steps.increment-version.outputs.build_number }}
       rc_branch_exists: ${{ steps.branch-check.outputs.rc_branch_exists }}
       hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
+    defaults:
+      run:
+        working-directory: apps/desktop
     steps:
       - name: Checkout repo
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
@@ -80,6 +82,9 @@ jobs:
     needs: setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+    defaults:
+      run:
+        working-directory: apps/desktop
     steps:
       - name: Checkout repo
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
@@ -88,7 +93,7 @@ jobs:
         uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
           cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache-dependency-path: 'apps/desktop/**/package-lock.json'
           node-version: '16'
 
       - name: Set Node options
@@ -181,7 +186,7 @@ jobs:
         uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
           cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache-dependency-path: 'apps/desktop/**/package-lock.json'
           node-version: '16'
 
       - name: Set Node options
@@ -353,6 +358,9 @@ jobs:
     needs: setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+    defaults:
+      run:
+        working-directory: apps/desktop
     steps:
       - name: Checkout repo
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
@@ -361,7 +369,7 @@ jobs:
         uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
           cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache-dependency-path: 'apps/desktop/**/package-lock.json'
           node-version: '16'
 
       - name: Set Node options
@@ -482,6 +490,9 @@ jobs:
       - macos-build
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+    defaults:
+      run:
+        working-directory: apps/desktop
     steps:
       - name: Checkout repo
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
@@ -490,7 +501,7 @@ jobs:
         uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
           cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache-dependency-path: 'apps/desktop/**/package-lock.json'
           node-version: '16'
 
       - name: Set Node options
@@ -652,6 +663,9 @@ jobs:
       - macos-build
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+    defaults:
+      run:
+        working-directory: apps/desktop
     steps:
       - name: Checkout repo
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
@@ -814,6 +828,9 @@ jobs:
       - macos-build
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+    defaults:
+      run:
+        working-directory: apps/desktop
     steps:
       - name: Checkout repo
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
@@ -822,7 +839,7 @@ jobs:
         uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
           cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache-dependency-path: 'apps/desktop/**/package-lock.json'
           node-version: '16'
 
       - name: Set Node options