Skip to content

Commit a1c3498

Browse files
committed
chore: simplify travis because now yarn & lang nodejs are supported
1 parent 1dfce99 commit a1c3498

File tree

3 files changed

+61
-62
lines changed

3 files changed

+61
-62
lines changed

.travis.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ osx_image: xcode8.3
33
dist: trusty
44
sudo: false
55

6-
language: c
6+
language: node_js
7+
node_js: "8"
78

89
env:
910
- ELECTRON_CACHE=$HOME/.electron
@@ -18,8 +19,8 @@ matrix:
1819
cache:
1920
directories:
2021
- node_modules
21-
- $HOME/.electron
22-
- $HOME/.cache
22+
- $HOME/Library/Caches/electron
23+
- $HOME/Library/Caches/electron-builder
2324

2425
addons:
2526
apt:
@@ -29,17 +30,14 @@ addons:
2930
- icnsutils
3031

3132
before_install:
32-
- mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v1.5.5/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-1.5.5.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull
33-
- curl -o- -L https://yarnpkg.com/install.sh | bash
34-
- export PATH="$HOME/.yarn/bin:$PATH"
33+
- mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v2.1.1/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-2.1.1.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull
3534

3635
install:
37-
- nvm install 7
38-
- yarn install
36+
- yarn
3937
- yarn add electron-builder@next --dev # force install next version to test electron-builder
4038

4139
script:
42-
- yarn run release
40+
- yarn release
4341

4442
branches:
4543
except:

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@
4444
},
4545
"dependencies": {
4646
"configstore": "^3.1.0",
47-
"electron-debug": "^1.1.0",
47+
"electron-debug": "^1.2.0",
4848
"electron-is-dev": "^0.1.2",
4949
"electron-log": "^2.2.6",
50-
"electron-updater": "^2.3.1",
50+
"electron-updater": "^2.4.2",
5151
"keytar": "^4.0.3"
5252
},
5353
"devDependencies": {
5454
"@types/debug": "^0.0.29",
5555
"electron": "1.7.3",
5656
"electron-builder": "next",
5757
"rimraf": "^2.6.1",
58-
"typescript": "^2.4.0"
58+
"typescript": "^2.3.4"
5959
}
6060
}

yarn.lock

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
resolved "https://registry.yarnpkg.com/@types/debug/-/debug-0.0.29.tgz#a1e514adfbd92f03a224ba54d693111dbf1f3754"
2828

2929
"@types/node@^7.0.18":
30-
version "7.0.31"
31-
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.31.tgz#80ea4d175599b2a00149c29a10a4eb2dff592e86"
30+
version "7.0.32"
31+
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.32.tgz#6afe6c66520a4c316623a14aef123908d01b4bba"
3232

3333
ajv-keywords@^2.1.0:
3434
version "2.1.0"
@@ -312,7 +312,7 @@ [email protected]:
312312
dependencies:
313313
ms "0.7.1"
314314

315-
debug@2.6.8, debug@^2.1.3, debug@^2.2.0, debug@^2.6.1, debug@^2.6.6, debug@^2.6.8:
315+
debug@^2.1.3, debug@^2.2.0, debug@^2.6.1, debug@^2.6.6, debug@^2.6.8:
316316
version "2.6.8"
317317
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
318318
dependencies:
@@ -346,22 +346,22 @@ ecc-jsbn@~0.1.1:
346346
dependencies:
347347
jsbn "~0.1.0"
348348

349-
electron-builder-http@19.5.1, electron-builder-http@~19.5.1:
350-
version "19.5.1"
351-
resolved "https://registry.yarnpkg.com/electron-builder-http/-/electron-builder-http-19.5.1.tgz#2afcd65ef97fbde3812eb68a65371b4ef278ac58"
349+
electron-builder-http@19.7.2, electron-builder-http@~19.7.2:
350+
version "19.7.2"
351+
resolved "https://registry.yarnpkg.com/electron-builder-http/-/electron-builder-http-19.7.2.tgz#5a63566e4a4685413861eaf087dcaa9a0e362a03"
352352
dependencies:
353-
debug "2.6.8"
353+
debug "^2.6.8"
354354
fs-extra-p "^4.3.0"
355355

356-
electron-builder-util@19.5.1, electron-builder-util@~19.5.1:
357-
version "19.5.1"
358-
resolved "https://registry.yarnpkg.com/electron-builder-util/-/electron-builder-util-19.5.1.tgz#4d63c207c64ae007d1e775a2f190ce4d1026ec70"
356+
electron-builder-util@19.7.2, electron-builder-util@~19.7.2:
357+
version "19.7.2"
358+
resolved "https://registry.yarnpkg.com/electron-builder-util/-/electron-builder-util-19.7.2.tgz#d33454ead9f6f782ebc4aa7503fa33034a940f22"
359359
dependencies:
360360
"7zip-bin" "^2.1.0"
361361
bluebird-lst "^1.0.2"
362362
chalk "^1.1.3"
363-
debug "2.6.8"
364-
electron-builder-http "~19.5.1"
363+
debug "^2.6.8"
364+
electron-builder-http "~19.7.2"
365365
fcopy-pre-bundled "0.3.4"
366366
fs-extra-p "^4.3.0"
367367
ini "^1.3.4"
@@ -372,8 +372,8 @@ [email protected], electron-builder-util@~19.5.1:
372372
tunnel-agent "^0.6.0"
373373

374374
electron-builder@next:
375-
version "19.5.1"
376-
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.5.1.tgz#20b0d0560c9a994bd42b78d3264b5ad45631ab17"
375+
version "19.7.3"
376+
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.7.3.tgz#37040a3a4a3e6fe8fff041a65210a7692817a53d"
377377
dependencies:
378378
"7zip-bin" "^2.1.0"
379379
ajv "^5.2.0"
@@ -383,20 +383,19 @@ electron-builder@next:
383383
chalk "^1.1.3"
384384
chromium-pickle-js "^0.2.0"
385385
cuint "^0.2.2"
386-
debug "2.6.8"
387-
electron-builder-http "19.5.1"
388-
electron-builder-util "19.5.1"
386+
debug "^2.6.8"
387+
electron-builder-http "19.7.2"
388+
electron-builder-util "19.7.2"
389389
electron-download-tf "4.3.1"
390390
electron-osx-sign "0.4.6"
391-
electron-publish "19.5.1"
391+
electron-publish "19.7.2"
392392
fs-extra-p "^4.3.0"
393393
hosted-git-info "^2.4.2"
394394
is-ci "^1.0.10"
395395
isbinaryfile "^3.0.2"
396396
js-yaml "^3.8.4"
397397
json5 "^0.5.1"
398398
minimatch "^3.0.4"
399-
node-forge "^0.7.1"
400399
normalize-package-data "^2.3.8"
401400
parse-color "^1.0.0"
402401
plist "^2.1.0"
@@ -406,12 +405,12 @@ electron-builder@next:
406405
uuid-1345 "^0.99.6"
407406
yargs "^8.0.2"
408407

409-
electron-debug@^1.1.0:
410-
version "1.1.0"
411-
resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-1.1.0.tgz#050a9c3f906fffc2492510cf8ac31d0f32a579e1"
408+
electron-debug@^1.2.0:
409+
version "1.2.0"
410+
resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-1.2.0.tgz#22e51a73e1bf095d0bb51a6c3d97a203364c4222"
412411
dependencies:
413412
electron-is-dev "^0.1.0"
414-
electron-localshortcut "^0.6.0"
413+
electron-localshortcut "^2.0.0"
415414

416415
417416
version "4.3.1"
@@ -441,13 +440,19 @@ electron-download@^3.0.1:
441440
semver "^5.3.0"
442441
sumchecker "^1.2.0"
443442

443+
electron-is-accelerator@^0.1.0:
444+
version "0.1.2"
445+
resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b"
446+
444447
electron-is-dev@^0.1.0, electron-is-dev@^0.1.2:
445448
version "0.1.2"
446449
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.1.2.tgz#8a1043e32b3a1da1c3f553dce28ce764246167e3"
447450

448-
electron-localshortcut@^0.6.0:
449-
version "0.6.1"
450-
resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-0.6.1.tgz#c4e268c38a6e42f40de5618fc906d1ed608f11aa"
451+
electron-localshortcut@^2.0.0:
452+
version "2.0.0"
453+
resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-2.0.0.tgz#bf088d42812d764c06ae0c9f179cf204d9c90103"
454+
dependencies:
455+
electron-is-accelerator "^0.1.0"
451456

452457
electron-log@^2.2.6:
453458
version "2.2.6"
@@ -465,24 +470,24 @@ [email protected]:
465470
plist "^2.0.1"
466471
tempfile "^1.1.1"
467472

468-
electron-publish@19.5.1:
469-
version "19.5.1"
470-
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.5.1.tgz#4300b9e80233b06c1eaa62d90a78e1030a4405f7"
473+
electron-publish@19.7.2:
474+
version "19.7.2"
475+
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.7.2.tgz#8fd8f1a6d895e2e0d4b654d2d78d1bd1b768e613"
471476
dependencies:
472477
bluebird-lst "^1.0.2"
473478
chalk "^1.1.3"
474-
electron-builder-http "~19.5.1"
475-
electron-builder-util "~19.5.1"
479+
electron-builder-http "~19.7.2"
480+
electron-builder-util "~19.7.2"
476481
fs-extra-p "^4.3.0"
477482
mime "^1.3.6"
478483

479-
electron-updater@^2.3.1:
480-
version "2.3.1"
481-
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.3.1.tgz#e3d4ae259421287f13fb7739b02da4ab004d599c"
484+
electron-updater@^2.4.2:
485+
version "2.4.2"
486+
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.4.2.tgz#47cc25b2ff880d6115a9f7df385983199e45c11b"
482487
dependencies:
483488
bluebird-lst "^1.0.2"
484489
debug "^2.6.8"
485-
electron-builder-http "~19.5.1"
490+
electron-builder-http "~19.7.2"
486491
electron-is-dev "^0.1.2"
487492
fs-extra-p "^4.3.0"
488493
js-yaml "^3.8.4"
@@ -752,7 +757,7 @@ inflight@^1.0.4:
752757
once "^1.3.0"
753758
wrappy "1"
754759

755-
inherits@2, inherits@^2.0.3, inherits@~2.0.1:
760+
inherits@2, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
756761
version "2.0.3"
757762
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
758763

@@ -1061,10 +1066,6 @@ node-emoji@^1.5.1:
10611066
dependencies:
10621067
string.prototype.codepointat "^0.2.0"
10631068

1064-
node-forge@^0.7.1:
1065-
version "0.7.1"
1066-
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.1.tgz#9da611ea08982f4b94206b3beb4cc9665f20c300"
1067-
10681069
normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.8:
10691070
version "2.3.8"
10701071
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
@@ -1307,14 +1308,14 @@ read-pkg@^2.0.0:
13071308
path-type "^2.0.0"
13081309

13091310
readable-stream@^2.2.2:
1310-
version "2.2.11"
1311-
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.11.tgz#0796b31f8d7688007ff0b93a8088d34aa17c0f72"
1311+
version "2.3.2"
1312+
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.2.tgz#5a04df05e4f57fe3f0dc68fdd11dc5c97c7e6f4d"
13121313
dependencies:
13131314
core-util-is "~1.0.0"
1314-
inherits "~2.0.1"
1315+
inherits "~2.0.3"
13151316
isarray "~1.0.0"
13161317
process-nextick-args "~1.0.6"
1317-
safe-buffer "~5.0.1"
1318+
safe-buffer "~5.1.0"
13181319
string_decoder "~1.0.0"
13191320
util-deprecate "~1.0.1"
13201321

@@ -1394,9 +1395,9 @@ rimraf@^2.2.8, rimraf@^2.6.1:
13941395
dependencies:
13951396
glob "^7.0.5"
13961397

1397-
safe-buffer@^5.0.1:
1398-
version "5.1.0"
1399-
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.0.tgz#fe4c8460397f9eaaaa58e73be46273408a45e223"
1398+
safe-buffer@^5.0.1, safe-buffer@~5.1.0:
1399+
version "5.1.1"
1400+
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
14001401

14011402
safe-buffer@~5.0.1:
14021403
version "5.0.1"
@@ -1409,8 +1410,8 @@ sanitize-filename@^1.6.1:
14091410
truncate-utf8-bytes "^1.0.0"
14101411

14111412
sax@^1.2.1:
1412-
version "1.2.2"
1413-
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
1413+
version "1.2.3"
1414+
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.3.tgz#a6134f5f11259b9a563f2f976bcf759d144803e3"
14141415

14151416
semver-diff@^2.0.0:
14161417
version "2.1.0"
@@ -1634,7 +1635,7 @@ typedarray@^0.0.6:
16341635
version "0.0.6"
16351636
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
16361637

1637-
typescript@^2.4.0:
1638+
typescript@^2.3.4:
16381639
version "2.4.0"
16391640
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.0.tgz#aef5a8d404beba36ad339abf079ddddfffba86dd"
16401641

0 commit comments

Comments
 (0)