diff options
-rw-r--r-- | .devcontainer/devcontainer.json | 5 | ||||
-rw-r--r-- | .github/workflows/dependency-updates.yml | 3 | ||||
-rw-r--r-- | .github/workflows/ferdi-builds.yml | 9 | ||||
-rw-r--r-- | .npmrc | 2 | ||||
m--------- | recipes | 0 |
5 files changed, 11 insertions, 8 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b015c114b..85a9c5a3b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json | |||
@@ -9,18 +9,23 @@ | |||
9 | "VARIANT": "14" | 9 | "VARIANT": "14" |
10 | } | 10 | } |
11 | }, | 11 | }, |
12 | |||
12 | // Set *default* container specific settings.json values on container create. | 13 | // Set *default* container specific settings.json values on container create. |
13 | "settings": { | 14 | "settings": { |
14 | "terminal.integrated.defaultProfile.linux": "/bin/bash" | 15 | "terminal.integrated.defaultProfile.linux": "/bin/bash" |
15 | }, | 16 | }, |
17 | |||
16 | // Add the IDs of extensions you want installed when the container is created. | 18 | // Add the IDs of extensions you want installed when the container is created. |
17 | "extensions": [ | 19 | "extensions": [ |
18 | "dbaeumer.vscode-eslint" | 20 | "dbaeumer.vscode-eslint" |
19 | ], | 21 | ], |
22 | |||
20 | // Use 'forwardPorts' to make a list of ports inside the container available locally. | 23 | // Use 'forwardPorts' to make a list of ports inside the container available locally. |
21 | // "forwardPorts": [], | 24 | // "forwardPorts": [], |
25 | |||
22 | // Use 'postCreateCommand' to run commands after the container is created. | 26 | // Use 'postCreateCommand' to run commands after the container is created. |
23 | // "postCreateCommand": "npm install", | 27 | // "postCreateCommand": "npm install", |
28 | |||
24 | // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. | 29 | // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. |
25 | "remoteUser": "node" | 30 | "remoteUser": "node" |
26 | } | 31 | } |
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 |
@@ -1,2 +1,4 @@ | |||
1 | save-exact = true | 1 | save-exact = true |
2 | engine-strict = true | 2 | engine-strict = true |
3 | unsafe-perm = true | ||
4 | frozen-lockfile = false | ||
diff --git a/recipes b/recipes | |||
Subproject b7a391072dae88bbb426f56fe817615225e0992 | Subproject fcd4e2de9c61bef33b1ed458cdda51b4651e5af | ||