Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit 639d71f

Browse files
authoredOct 10, 2020
fix: use fetch in electron renderer and electron-fetch in main (#3251)
Lets us run test on Linux which roughly halves the amount of time Electron CI tasks take.
1 parent 8e44e52 commit 639d71f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+79
-78
lines changed
 

‎.travis.yml

-8
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,11 @@ jobs:
9393

9494
- stage: test
9595
name: electron-main
96-
os: osx
9796
script:
9897
- npm run test:electron-main -- $RUN_SINCE -- -- --bail --timeout 60000
9998

10099
- stage: test
101100
name: electron-renderer
102-
os: osx
103101
script:
104102
- npm run test:electron-renderer -- $RUN_SINCE -- -- --bail --timeout 60000
105103

@@ -115,13 +113,11 @@ jobs:
115113

116114
- stage: test
117115
name: interop - electron-main
118-
os: osx
119116
script:
120117
- npm run test:interop -- $RUN_SINCE -- -- -- -t electron-main -f ./test/node.js --bail --timeout 60000
121118

122119
- stage: test
123120
name: interop - electron-renderer
124-
os: osx
125121
script:
126122
- npm run test:interop -- $RUN_SINCE -- -- -- -t electron-renderer -f ./test/browser.js -bail --timeout 60000
127123

@@ -152,13 +148,11 @@ jobs:
152148

153149
- stage: test
154150
name: js-ipfs interface tests - electron main
155-
os: osx
156151
script:
157152
- npm run test:interface:core -- $RUN_SINCE -- -- --bail -t electron-main --timeout 60000
158153

159154
- stage: test
160155
name: js-ipfs interface tests - electron renderer
161-
os: osx
162156
script:
163157
- npm run test:interface:core -- $RUN_SINCE -- -- --bail -t electron-renderer --timeout 60000
164158

@@ -214,13 +208,11 @@ jobs:
214208

215209
- stage: test
216210
name: http-api-client interface tests vs js-ipfs - electron main
217-
os: osx
218211
script:
219212
- npm run test:interface:http-js -- $RUN_SINCE -- -- --bail -t electron-main --timeout 60000
220213

221214
- stage: test
222215
name: http-api-client interface tests vs js-ipfs - electron renderer
223-
os: osx
224216
script:
225217
- npm run test:interface:http-js -- $RUN_SINCE -- -- --bail -t electron-renderer --timeout 60000
226218

‎examples/browser-ipns-publish/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"human-crypto-keys": "^0.1.4",
1616
"ipfs": "^0.50.1",
1717
"ipfs-http-client": "^47.0.0",
18-
"ipfs-utils": "^3.0.0",
18+
"ipfs-utils": "^4.0.0",
1919
"ipns": "^0.8.0",
2020
"it-last": "^1.0.4",
2121
"p-retry": "^4.2.0",
@@ -27,7 +27,7 @@
2727
"devDependencies": {
2828
"delay": "^4.4.0",
2929
"execa": "^4.0.3",
30-
"ipfsd-ctl": "^7.0.0",
30+
"ipfsd-ctl": "^7.0.2",
3131
"go-ipfs": "^0.7.0",
3232
"parcel-bundler": "^1.12.4",
3333
"path": "^0.12.7",

0 commit comments

Comments
 (0)