From 8e9d41ad4d9bd1667e1a5b93a6932cad4d3fabc4 Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Fri, 10 Sep 2021 15:41:18 +0530
Subject: fix: pnpm install of 'node-mac-permissions' on win

(remove recursive pnpm module installation since that is handled separately)
---
 .github/workflows/dependency-updates.yml | 3 +--
 .github/workflows/ferdi-builds.yml       | 9 +++------
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index aa3fe6d39..d41ded354 100644
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -41,7 +41,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
             ${{ runner.os }}-14.17-build-
-      - name: Cache .pnpm-store
+      - name: Cache pnpm modules
         uses: actions/cache@v2
         env:
           cache-name: cache-pnpm-store
@@ -56,7 +56,6 @@ jobs:
         uses: pnpm/action-setup@v2.0.1
         with:
           version: 6.14.7
-          run_install: true
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index 820725a1d..e3e504731 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -117,7 +117,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
             ${{ runner.os }}-14.17-build-
-      - name: Cache .pnpm-store
+      - name: Cache pnpm modules
         uses: actions/cache@v2
         env:
           cache-name: cache-pnpm-store
@@ -150,7 +150,6 @@ jobs:
         uses: pnpm/action-setup@v2.0.1
         with:
           version: 6.14.7
-          run_install: true
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
@@ -228,7 +227,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
             ${{ runner.os }}-14.17-build-
-      - name: Cache .pnpm-store
+      - name: Cache pnpm modules
         uses: actions/cache@v2
         env:
           cache-name: cache-pnpm-store
@@ -257,7 +256,6 @@ jobs:
         uses: pnpm/action-setup@v2.0.1
         with:
           version: 6.14.7
-          run_install: true
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
@@ -356,7 +354,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
             ${{ runner.os }}-14.17-build-
-      - name: Cache .pnpm-store
+      - name: Cache pnpm modules
         uses: actions/cache@v2
         env:
           cache-name: cache-pnpm-store
@@ -385,7 +383,6 @@ jobs:
         uses: pnpm/action-setup@v2.0.1
         with:
           version: 6.14.7
-          run_install: true
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
-- 
cgit v1.2.3-54-g00ecf