diff options
-rw-r--r-- | .github/workflows/dependency-updates.yml | 2 | ||||
-rw-r--r-- | .github/workflows/ferdi-builds.yml | 6 | ||||
-rw-r--r-- | CONTRIBUTING.md | 6 | ||||
-rw-r--r-- | Dockerfile | 2 | ||||
-rw-r--r-- | package.json | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index eafa6645e..4931989f1 100644 --- a/.github/workflows/dependency-updates.yml +++ b/.github/workflows/dependency-updates.yml | |||
@@ -59,7 +59,7 @@ jobs: | |||
59 | - name: Uninstall locally and reinstall global npm modules | 59 | - name: Uninstall locally and reinstall global npm modules |
60 | run: | | 60 | run: | |
61 | npm uninstall node-gyp | 61 | npm uninstall node-gyp |
62 | npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0 | 62 | npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0 |
63 | npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0 | 63 | npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0 |
64 | - name: Install node dependencies recursively | 64 | - name: Install node dependencies recursively |
65 | run: npx lerna bootstrap | 65 | run: npx lerna bootstrap |
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml index 062243659..0f15a3ec3 100644 --- a/.github/workflows/ferdi-builds.yml +++ b/.github/workflows/ferdi-builds.yml | |||
@@ -156,7 +156,7 @@ jobs: | |||
156 | - name: Uninstall locally and reinstall global npm modules | 156 | - name: Uninstall locally and reinstall global npm modules |
157 | run: | | 157 | run: | |
158 | npm uninstall node-gyp | 158 | npm uninstall node-gyp |
159 | npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0 | 159 | npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0 |
160 | npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0 | 160 | npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0 |
161 | - name: Install node dependencies recursively | 161 | - name: Install node dependencies recursively |
162 | run: npx lerna bootstrap | 162 | run: npx lerna bootstrap |
@@ -260,7 +260,7 @@ jobs: | |||
260 | - name: Uninstall locally and reinstall global npm modules | 260 | - name: Uninstall locally and reinstall global npm modules |
261 | run: | | 261 | run: | |
262 | npm uninstall node-gyp | 262 | npm uninstall node-gyp |
263 | npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0 | 263 | npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0 |
264 | npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0 | 264 | npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0 |
265 | - name: Install node dependencies recursively | 265 | - name: Install node dependencies recursively |
266 | run: npx lerna bootstrap | 266 | run: npx lerna bootstrap |
@@ -385,7 +385,7 @@ jobs: | |||
385 | - name: Uninstall locally and reinstall global npm modules | 385 | - name: Uninstall locally and reinstall global npm modules |
386 | run: | | 386 | run: | |
387 | npm uninstall node-gyp | 387 | npm uninstall node-gyp |
388 | npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0 | 388 | npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0 |
389 | npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0 | 389 | npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0 |
390 | shell: bash | 390 | shell: bash |
391 | - name: Install node dependencies recursively | 391 | - name: Install node dependencies recursively |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 76ad5266b..49ec44b3f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md | |||
@@ -13,7 +13,7 @@ | |||
13 | - [How Can I Contribute?](#how-can-i-contribute) | 13 | - [How Can I Contribute?](#how-can-i-contribute) |
14 | - [Setting up your Development machine](#setting-up-your-development-machine) | 14 | - [Setting up your Development machine](#setting-up-your-development-machine) |
15 | - [Install System-level dependencies](#install-system-level-dependencies) | 15 | - [Install System-level dependencies](#install-system-level-dependencies) |
16 | - [Node.js, npm, node-gyp](#nodejs-npm-node-gyp) | 16 | - [Node.js, npm, pnpm](#nodejs-npm-pnpm) |
17 | - [Git](#git) | 17 | - [Git](#git) |
18 | - [Debian/Ubuntu](#debianubuntu) | 18 | - [Debian/Ubuntu](#debianubuntu) |
19 | - [Fedora](#fedora) | 19 | - [Fedora](#fedora) |
@@ -56,7 +56,7 @@ As a basic rule, before filing issues, feature requests or anything else. Take a | |||
56 | 56 | ||
57 | ### Install System-level dependencies | 57 | ### Install System-level dependencies |
58 | 58 | ||
59 | #### Node.js, npm, node-gyp | 59 | #### Node.js, npm, pnpm |
60 | 60 | ||
61 | Please make sure you are conforming to the `engines` requirements used by the developers/contributors as specified in the [package.json file](./package.json#engines). | 61 | Please make sure you are conforming to the `engines` requirements used by the developers/contributors as specified in the [package.json file](./package.json#engines). |
62 | 62 | ||
@@ -104,7 +104,7 @@ npm i -g windows-build-tools --vs2015 | |||
104 | We need `node-gyp` to be able to compile any native dependencies | 104 | We need `node-gyp` to be able to compile any native dependencies |
105 | 105 | ||
106 | ```bash | 106 | ```bash |
107 | npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0 | 107 | npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0 |
108 | ``` | 108 | ``` |
109 | 109 | ||
110 | #### Lerna | 110 | #### Lerna |
diff --git a/Dockerfile b/Dockerfile index cb3053708..bccfdd6fc 100644 --- a/Dockerfile +++ b/Dockerfile | |||
@@ -17,7 +17,7 @@ RUN apt-get update -y \ | |||
17 | WORKDIR /usr/src/ferdi | 17 | WORKDIR /usr/src/ferdi |
18 | 18 | ||
19 | RUN npm i -g pnpm@6.16.0 \ | 19 | RUN npm i -g pnpm@6.16.0 \ |
20 | && npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0 \ | 20 | && npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0 \ |
21 | && npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0 | 21 | && npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0 |
22 | 22 | ||
23 | COPY package*.json . | 23 | COPY package*.json . |
diff --git a/package.json b/package.json index 9a1ecf549..cc5abc21d 100644 --- a/package.json +++ b/package.json | |||
@@ -13,7 +13,7 @@ | |||
13 | "engines": { | 13 | "engines": { |
14 | "node": "^14.17", | 14 | "node": "^14.17", |
15 | "npm": "^6.14", | 15 | "npm": "^6.14", |
16 | "node-gyp": "^8.1" | 16 | "node-gyp": "^8.2" |
17 | }, | 17 | }, |
18 | "engine-strict": true, | 18 | "engine-strict": true, |
19 | "scripts": { | 19 | "scripts": { |