Skip to content

Commit 0f1c5ac

Browse files
Switching to Yarn and fixing CI
1 parent a7bd15a commit 0f1c5ac

File tree

5 files changed

+39
-32
lines changed

5 files changed

+39
-32
lines changed

.travis.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
language: node_js
22
node_js: 8
33

4+
sudo: required
5+
dist: trusty
6+
47
cache:
58
directories:
69
- node_modules
@@ -20,8 +23,14 @@ addons:
2023
- gcc-multilib
2124
- g++-multilib
2225

26+
27+
install:
28+
- curl -L https://yarnpkg.com/latest.tar.gz | tar xvz && mv yarn-* $HOME/.yarn
29+
- export PATH="$HOME/.yarn/bin:$PATH"
30+
- yarn
31+
2332
script:
24-
- npm run dist
33+
- yarn dist
2534

2635
notifications:
2736
slack: ramme:44ubE4BVf3FGi8OldEKL743J

app/yarn.lock

+12-17
Original file line numberDiff line numberDiff line change
@@ -179,24 +179,15 @@ electron-config@^1.0.0:
179179
dependencies:
180180
conf "^1.0.0"
181181

182-
electron-debug@^1.1.0:
183-
version "1.1.0"
184-
resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-1.1.0.tgz#050a9c3f906fffc2492510cf8ac31d0f32a579e1"
185-
dependencies:
186-
electron-is-dev "^0.1.0"
187-
electron-localshortcut "^0.6.0"
188-
189-
electron-is-dev@^0.1.0, electron-is-dev@^0.1.2:
190-
version "0.1.2"
191-
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.1.2.tgz#8a1043e32b3a1da1c3f553dce28ce764246167e3"
192-
193-
electron-localshortcut@^0.6.0:
194-
version "0.6.1"
195-
resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-0.6.1.tgz#c4e268c38a6e42f40de5618fc906d1ed608f11aa"
182+
electron-is-dev@^0.3.0:
183+
version "0.3.0"
184+
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe"
196185

197-
element-ready@^1.0.0:
198-
version "1.0.0"
199-
resolved "https://registry.yarnpkg.com/element-ready/-/element-ready-1.0.0.tgz#1e388cbc5cc543a71e5039a022deb8c8b9f169be"
186+
element-ready@^2.2.0:
187+
version "2.2.0"
188+
resolved "https://registry.yarnpkg.com/element-ready/-/element-ready-2.2.0.tgz#a504524bb70fd6a310b80a6be49971e4c0752f6e"
189+
dependencies:
190+
p-cancelable "^0.3.0"
200191

201192
env-paths@^1.0.0:
202193
version "1.0.0"
@@ -552,6 +543,10 @@ osx-release@^1.0.0:
552543
dependencies:
553544
minimist "^1.1.0"
554545

546+
p-cancelable@^0.3.0:
547+
version "0.3.0"
548+
resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
549+
555550
p-limit@^1.1.0:
556551
version "1.1.0"
557552
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"

appveyor.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1+
image: Visual Studio 2017
2+
13
environment:
24
nodejs_version: '8'
35

46
platform:
57
- x86
8+
- x64
69

710
cache:
811
- node_modules
12+
- '%LOCALAPPDATA%\electron\Cache'
13+
- '%LOCALAPPDATA%\electron-builder\cache'
914
- '%USERPROFILE%\.electron'
1015

1116
install:
12-
- ps: Install-Product node $env:nodejs_version
13-
- npm install
14-
- npm install npm -g
17+
- ps: Install-Product node 8 x64
18+
- yarn
1519

1620
test_script:
17-
- npm run test
21+
- yarn test
1822

1923
build_script:
20-
- npm run dist
24+
- yarn dist

package.json

+7-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"author": "Terkel Gjervig",
44
"license": "MIT",
55
"scripts": {
6-
"postinstall": "cd app && npm install",
6+
"postinstall": "electron-builder install-app-deps && cd app && yarn",
77
"test": "standard",
88
"build": "gulp build",
99
"dev": "gulp dev & electron app",
10-
"prestart": "npm run build",
10+
"prestart": "yarn build",
1111
"start": "electron app",
12-
"pack": "npm run build && build --dir",
13-
"dist": "npm run build && build --ia32 --x64"
12+
"pack": "yarn build && build --dir",
13+
"dist": "yarn build && build --ia32 --x64"
1414
},
1515
"build": {
1616
"appId": "com.terkel.ramme",
@@ -19,13 +19,12 @@
1919
},
2020
"linux": {
2121
"synopsis": "Unofficial Instagram Desktop App",
22-
"category": "Network;",
22+
"category": "Network",
2323
"target": [
2424
"deb",
2525
"rpm",
2626
"pacman",
27-
"tar.gz",
28-
"AppImage"
27+
"tar.gz"
2928
]
3029
}
3130
},
@@ -35,7 +34,7 @@
3534
"babili": "^0.1.4",
3635
"del": "^3.0.0",
3736
"electron": "^1.7.8",
38-
"electron-builder": "^19.34.2",
37+
"electron-builder": "^19.35.1",
3938
"gulp": "github:gulpjs/gulp#4.0",
4039
"gulp-autoprefixer": "^4.0.0",
4140
"gulp-babel": "^7.0.0",

yarn.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -1710,7 +1710,7 @@ ejs@^2.5.7:
17101710
version "2.5.7"
17111711
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
17121712

1713-
electron-builder@^19.34.2:
1713+
electron-builder@^19.35.1:
17141714
version "19.35.1"
17151715
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.35.1.tgz#2f3efd80a960cea806afc40c0afc386e322f51bb"
17161716
dependencies:

0 commit comments

Comments
 (0)