aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/dependency-updates.yml2
-rw-r--r--.github/workflows/ferdi-builds.yml6
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--Dockerfile2
4 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index 81a8ad556..9c4bcc1bb 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.2.0 || npm i -g node-gyp@8.2.0 62 npm ls -g node-gyp@8.3.0 || npm i -g node-gyp@8.3.0
63 - name: Install node dependencies 63 - name: Install node dependencies
64 run: npm i 64 run: npm i
65 - name: Update submodules 65 - name: Update submodules
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index e00893c19..b3d7e61fb 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.2.0 || npm i -g node-gyp@8.2.0 159 npm ls -g node-gyp@8.3.0 || npm i -g node-gyp@8.3.0
160 - name: Install node dependencies 160 - name: Install node dependencies
161 run: npm i 161 run: npm i
162 - name: Package recipes 162 - name: Package recipes
@@ -259,7 +259,7 @@ jobs:
259 - name: Uninstall locally and reinstall global npm modules 259 - name: Uninstall locally and reinstall global npm modules
260 run: | 260 run: |
261 npm uninstall node-gyp 261 npm uninstall node-gyp
262 npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0 262 npm ls -g node-gyp@8.3.0 || npm i -g node-gyp@8.3.0
263 - name: Install node dependencies 263 - name: Install node dependencies
264 run: npm i 264 run: npm i
265 - name: Figure out used package.json version 265 - name: Figure out used package.json version
@@ -383,7 +383,7 @@ jobs:
383 - name: Uninstall locally and reinstall global npm modules 383 - name: Uninstall locally and reinstall global npm modules
384 run: | 384 run: |
385 npm uninstall node-gyp 385 npm uninstall node-gyp
386 npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0 386 npm ls -g node-gyp@8.3.0 || npm i -g node-gyp@8.3.0
387 shell: bash 387 shell: bash
388 - name: Install node dependencies 388 - name: Install node dependencies
389 run: npm i 389 run: npm i
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 65c9a30ca..3d4efb98b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -100,7 +100,7 @@ npm i -g windows-build-tools --vs2015
100We need `node-gyp` to be able to compile any native dependencies 100We need `node-gyp` to be able to compile any native dependencies
101 101
102```bash 102```bash
103npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0 103npm ls -g node-gyp@8.3.0 || npm i -g node-gyp@8.3.0
104``` 104```
105 105
106### Clone repository with submodule 106### Clone repository with submodule
diff --git a/Dockerfile b/Dockerfile
index 13551dad3..39d5cefda 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update -y \
17WORKDIR /usr/src/ferdi 17WORKDIR /usr/src/ferdi
18 18
19RUN npm i -g pnpm@6.19.0 \ 19RUN npm i -g pnpm@6.19.0 \
20 && npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0 20 && npm ls -g node-gyp@8.3.0 || npm i -g node-gyp@8.3.0
21 21
22COPY package*.json . 22COPY package*.json .
23 23