aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay A <avijayr@protonmail.com>2021-07-26 09:49:32 +0530
committerLibravatar Vijay A <avijayr@protonmail.com>2021-07-26 09:49:32 +0530
commitbd2d2d445f1c3c3bd0ef0fbe094c9377517f45ab (patch)
tree7b015dbd8b4eab167d77f1a7d88417bd658b0256
parentUse node-gyp@8.1 for all CI builds (and brings windows at par with macos and ... (diff)
downloadferdium-app-bd2d2d445f1c3c3bd0ef0fbe094c9377517f45ab.tar.gz
ferdium-app-bd2d2d445f1c3c3bd0ef0fbe094c9377517f45ab.tar.zst
ferdium-app-bd2d2d445f1c3c3bd0ef0fbe094c9377517f45ab.zip
Missed removing of custom npm config setter for node-gyp. [skip ci]
-rw-r--r--.github/workflows/dependency-updates.yml2
-rw-r--r--Dockerfile3
2 files changed, 2 insertions, 3 deletions
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index 24f02bdc5..460256e6a 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.1.0 && npm config set node_gyp "$(which node-gyp)" 51 npm i -g node-gyp@8.1.0
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/Dockerfile b/Dockerfile
index c78a36596..71fca5d22 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,7 @@ WORKDIR /usr/src/ferdi
21COPY package*.json ./ 21COPY package*.json ./
22COPY lerna.json ./ 22COPY lerna.json ./
23 23
24RUN npm i -g node-gyp@8.1.0 \ 24RUN npm i -g node-gyp@8.1.0
25 && npm config set node_gyp "$(which node-gyp)"
26 25
27COPY . . 26COPY . .
28 27