Skip to content

Commit f476598

Browse files
committed
npm install with --legacy-peer-deps, notarize even when not on a tag
1 parent 5fd0209 commit f476598

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ references:
5454
command: |
5555
source $HOME/.nvm/nvm.sh
5656
nvm use
57-
npm install --force
57+
npm install --legacy-peer-deps
5858
npm_restore_cache: &npm_restore_cache
5959
restore_cache:
6060
name: Restore npm cache
@@ -200,7 +200,7 @@ jobs:
200200
- run:
201201
name: Npm install
202202
command: |
203-
npm install --force
203+
npm install --legacy-peer-deps
204204
- run:
205205
name: Build windows
206206
command: |
@@ -244,7 +244,7 @@ jobs:
244244
- run:
245245
name: Npm install
246246
command: |
247-
npm install --force
247+
npm install --legacy-peer-deps
248248
- run:
249249
name: Build windows
250250
command: |

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ package-linux: build-if-changed
140140
install: node_modules
141141

142142
node_modules/%:
143-
@npm install $(notdir $@)
143+
@npm install $(notdir $@) --legacy-peer-deps
144144

145145
node_modules: package.json
146146
@npm prune
147-
@npm install
147+
@npm install --legacy-peer-deps
148148
@touch node_modules
149149

150150

after_sign_hook.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ module.exports = async function (params) {
77
return;
88
}
99

10-
if (!process.env.CIRCLE_TAG || process.env.CIRCLE_TAG.length === 0) {
11-
console.log('Not on a tag. Skipping notarization'); // eslint-disable-line no-console
12-
return;
13-
}
14-
1510
// Same appId in electron-builder.
1611
let appId = 'com.automattic.simplenote';
1712

0 commit comments

Comments
 (0)