diff options
author | Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-07-26 04:04:27 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-26 09:34:27 +0530 |
commit | 2993efc83e7f557a9c36e7915a54c62c5f90296e (patch) | |
tree | 4eab395bfdd230cccf53bf6ec376df8a6114c104 | |
parent | Updated CHANGELOG.md with old change logs (diff) | |
download | ferdium-app-2993efc83e7f557a9c36e7915a54c62c5f90296e.tar.gz ferdium-app-2993efc83e7f557a9c36e7915a54c62c5f90296e.tar.zst ferdium-app-2993efc83e7f557a9c36e7915a54c62c5f90296e.zip |
Use node-gyp@8.1 for all CI builds (and brings windows at par with macos and linux) (#1690)
Upgraded node-gyp to '8.1.0' (since this was a pre-requisite for it to work on windows os)
-rw-r--r-- | .github/workflows/dependency-updates.yml | 2 | ||||
-rw-r--r-- | .github/workflows/ferdi-builds.yml | 9 | ||||
-rw-r--r-- | CONTRIBUTING.md | 2 | ||||
-rw-r--r-- | Dockerfile | 2 | ||||
-rw-r--r-- | package.json | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index cb40dc27c..24f02bdc5 100644 --- a/.github/workflows/dependency-updates.yml +++ b/.github/workflows/dependency-updates.yml | |||
@@ -48,7 +48,7 @@ jobs: | |||
48 | - name: Uninstall locally and reinstall node-gyp globally | 48 | - name: Uninstall locally and reinstall node-gyp globally |
49 | run: | | 49 | run: | |
50 | npm uninstall node-gyp | 50 | npm uninstall node-gyp |
51 | npm i -g node-gyp@8.0.0 && npm config set node_gyp "$(which node-gyp)" | 51 | npm i -g node-gyp@8.1.0 && npm config set node_gyp "$(which node-gyp)" |
52 | - name: Install node dependencies recursively | 52 | - name: Install node dependencies recursively |
53 | run: npx lerna bootstrap | 53 | run: npx lerna bootstrap |
54 | - name: Update submodules | 54 | - name: Update submodules |
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml index 6c45e65b5..3e53d4e71 100644 --- a/.github/workflows/ferdi-builds.yml +++ b/.github/workflows/ferdi-builds.yml | |||
@@ -129,7 +129,7 @@ jobs: | |||
129 | - name: Uninstall locally and reinstall node-gyp globally | 129 | - name: Uninstall locally and reinstall node-gyp globally |
130 | run: | | 130 | run: | |
131 | npm uninstall node-gyp | 131 | npm uninstall node-gyp |
132 | npm i -g node-gyp@8.0.0 && npm config set node_gyp "$(which node-gyp)" | 132 | npm i -g node-gyp@8.1.0 |
133 | - name: Fix corrupted node cache | 133 | - name: Fix corrupted node cache |
134 | run: npm cache clean --force | 134 | run: npm cache clean --force |
135 | - name: Install node dependencies recursively | 135 | - name: Install node dependencies recursively |
@@ -222,7 +222,7 @@ jobs: | |||
222 | - name: Uninstall locally and reinstall node-gyp globally | 222 | - name: Uninstall locally and reinstall node-gyp globally |
223 | run: | | 223 | run: | |
224 | npm uninstall node-gyp | 224 | npm uninstall node-gyp |
225 | npm i -g node-gyp@8.0.0 && npm config set node_gyp "$(which node-gyp)" | 225 | npm i -g node-gyp@8.1.0 |
226 | - name: Fix corrupted node cache | 226 | - name: Fix corrupted node cache |
227 | run: npm cache clean --force | 227 | run: npm cache clean --force |
228 | - name: Install node dependencies recursively | 228 | - name: Install node dependencies recursively |
@@ -308,6 +308,11 @@ jobs: | |||
308 | uses: actions/setup-node@v2 | 308 | uses: actions/setup-node@v2 |
309 | with: | 309 | with: |
310 | node-version: 14.17.3 | 310 | node-version: 14.17.3 |
311 | - name: Uninstall locally and reinstall node-gyp globally | ||
312 | run: | | ||
313 | npm uninstall node-gyp | ||
314 | npm i -g node-gyp@8.1.0 | ||
315 | shell: bash | ||
311 | - name: Fix corrupted node cache | 316 | - name: Fix corrupted node cache |
312 | run: npm cache clean --force | 317 | run: npm cache clean --force |
313 | shell: bash | 318 | shell: bash |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0b643ea10..ec487283c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md | |||
@@ -62,7 +62,7 @@ v14.17.3 | |||
62 | npm -v | 62 | npm -v |
63 | 6.14.12 | 63 | 6.14.12 |
64 | node-gyp -v | 64 | node-gyp -v |
65 | v8.0.0 | 65 | v8.1.0 |
66 | ``` | 66 | ``` |
67 | 67 | ||
68 | #### Git | 68 | #### Git |
diff --git a/Dockerfile b/Dockerfile index bb0381d31..c78a36596 100644 --- a/Dockerfile +++ b/Dockerfile | |||
@@ -21,7 +21,7 @@ WORKDIR /usr/src/ferdi | |||
21 | COPY package*.json ./ | 21 | COPY package*.json ./ |
22 | COPY lerna.json ./ | 22 | COPY lerna.json ./ |
23 | 23 | ||
24 | RUN npm i -g node-gyp@8.0.0 \ | 24 | RUN npm i -g node-gyp@8.1.0 \ |
25 | && npm config set node_gyp "$(which node-gyp)" | 25 | && npm config set node_gyp "$(which node-gyp)" |
26 | 26 | ||
27 | COPY . . | 27 | COPY . . |
diff --git a/package.json b/package.json index 58108204c..3dfb750c7 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.0" | 16 | "node-gyp": "^8.1" |
17 | }, | 17 | }, |
18 | "engine-strict": true, | 18 | "engine-strict": true, |
19 | "scripts": { | 19 | "scripts": { |