diff options
| author |  Vijay A <avijayr@protonmail.com> | 2021-09-10 15:41:18 +0530 |
|---|---|---|
| committer | Vijay A <avijayr@protonmail.com> | 2021-09-10 16:07:38 +0530 |
| commit | 8e9d41ad4d9bd1667e1a5b93a6932cad4d3fabc4 (patch) | |
| tree | 0802bc52e681bddde3c4c9f05e0a492f46e37b4c /.github/workflows | |
| parent | docs: updated Changelog [skip ci] (diff) | |
| download | ferdium-app-8e9d41ad4d9bd1667e1a5b93a6932cad4d3fabc4.tar.gz ferdium-app-8e9d41ad4d9bd1667e1a5b93a6932cad4d3fabc4.tar.zst ferdium-app-8e9d41ad4d9bd1667e1a5b93a6932cad4d3fabc4.zip | |
fix: pnpm install of 'node-mac-permissions' on win
(remove recursive pnpm module installation since that is handled separately)
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/dependency-updates.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/ferdi-builds.yml | 9 |
2 files changed, 4 insertions, 8 deletions
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: | |||
| 41 | restore-keys: | | 41 | restore-keys: | |
| 42 | ${{ runner.os }}-14.17-build-${{ env.cache-name }}- | 42 | ${{ runner.os }}-14.17-build-${{ env.cache-name }}- |
| 43 | ${{ runner.os }}-14.17-build- | 43 | ${{ runner.os }}-14.17-build- |
| 44 | - name: Cache .pnpm-store | 44 | - name: Cache pnpm modules |
| 45 | uses: actions/cache@v2 | 45 | uses: actions/cache@v2 |
| 46 | env: | 46 | env: |
| 47 | cache-name: cache-pnpm-store | 47 | cache-name: cache-pnpm-store |
| @@ -56,7 +56,6 @@ jobs: | |||
| 56 | uses: pnpm/action-setup@v2.0.1 | 56 | uses: pnpm/action-setup@v2.0.1 |
| 57 | with: | 57 | with: |
| 58 | version: 6.14.7 | 58 | version: 6.14.7 |
| 59 | run_install: true | ||
| 60 | - name: Uninstall locally and reinstall global npm modules | 59 | - name: Uninstall locally and reinstall global npm modules |
| 61 | run: | | 60 | run: | |
| 62 | npm uninstall node-gyp | 61 | 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: | |||
| 117 | restore-keys: | | 117 | restore-keys: | |
| 118 | ${{ runner.os }}-14.17-build-${{ env.cache-name }}- | 118 | ${{ runner.os }}-14.17-build-${{ env.cache-name }}- |
| 119 | ${{ runner.os }}-14.17-build- | 119 | ${{ runner.os }}-14.17-build- |
| 120 | - name: Cache .pnpm-store | 120 | - name: Cache pnpm modules |
| 121 | uses: actions/cache@v2 | 121 | uses: actions/cache@v2 |
| 122 | env: | 122 | env: |
| 123 | cache-name: cache-pnpm-store | 123 | cache-name: cache-pnpm-store |
| @@ -150,7 +150,6 @@ jobs: | |||
| 150 | uses: pnpm/action-setup@v2.0.1 | 150 | uses: pnpm/action-setup@v2.0.1 |
| 151 | with: | 151 | with: |
| 152 | version: 6.14.7 | 152 | version: 6.14.7 |
| 153 | run_install: true | ||
| 154 | - name: Uninstall locally and reinstall global npm modules | 153 | - name: Uninstall locally and reinstall global npm modules |
| 155 | run: | | 154 | run: | |
| 156 | npm uninstall node-gyp | 155 | npm uninstall node-gyp |
| @@ -228,7 +227,7 @@ jobs: | |||
| 228 | restore-keys: | | 227 | restore-keys: | |
| 229 | ${{ runner.os }}-14.17-build-${{ env.cache-name }}- | 228 | ${{ runner.os }}-14.17-build-${{ env.cache-name }}- |
| 230 | ${{ runner.os }}-14.17-build- | 229 | ${{ runner.os }}-14.17-build- |
| 231 | - name: Cache .pnpm-store | 230 | - name: Cache pnpm modules |
| 232 | uses: actions/cache@v2 | 231 | uses: actions/cache@v2 |
| 233 | env: | 232 | env: |
| 234 | cache-name: cache-pnpm-store | 233 | cache-name: cache-pnpm-store |
| @@ -257,7 +256,6 @@ jobs: | |||
| 257 | uses: pnpm/action-setup@v2.0.1 | 256 | uses: pnpm/action-setup@v2.0.1 |
| 258 | with: | 257 | with: |
| 259 | version: 6.14.7 | 258 | version: 6.14.7 |
| 260 | run_install: true | ||
| 261 | - name: Uninstall locally and reinstall global npm modules | 259 | - name: Uninstall locally and reinstall global npm modules |
| 262 | run: | | 260 | run: | |
| 263 | npm uninstall node-gyp | 261 | npm uninstall node-gyp |
| @@ -356,7 +354,7 @@ jobs: | |||
| 356 | restore-keys: | | 354 | restore-keys: | |
| 357 | ${{ runner.os }}-14.17-build-${{ env.cache-name }}- | 355 | ${{ runner.os }}-14.17-build-${{ env.cache-name }}- |
| 358 | ${{ runner.os }}-14.17-build- | 356 | ${{ runner.os }}-14.17-build- |
| 359 | - name: Cache .pnpm-store | 357 | - name: Cache pnpm modules |
| 360 | uses: actions/cache@v2 | 358 | uses: actions/cache@v2 |
| 361 | env: | 359 | env: |
| 362 | cache-name: cache-pnpm-store | 360 | cache-name: cache-pnpm-store |
| @@ -385,7 +383,6 @@ jobs: | |||
| 385 | uses: pnpm/action-setup@v2.0.1 | 383 | uses: pnpm/action-setup@v2.0.1 |
| 386 | with: | 384 | with: |
| 387 | version: 6.14.7 | 385 | version: 6.14.7 |
| 388 | run_install: true | ||
| 389 | - name: Uninstall locally and reinstall global npm modules | 386 | - name: Uninstall locally and reinstall global npm modules |
| 390 | run: | | 387 | run: | |
| 391 | npm uninstall node-gyp | 388 | npm uninstall node-gyp |