Skip to content

Commit 4fc19a9

Browse files
author
Maksim Kostromin
committed
yarn -> npm
1 parent 0fc7d40 commit 4fc19a9

File tree

2 files changed

+78
-81
lines changed

2 files changed

+78
-81
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ dist/
55

66
# Editor directories and files
77
.idea
8+
*.iml
9+
*.ipr
10+
*.iws
811
*.suo
912
*.ntvs*
1013
*.njsproj

.travis.yml

Lines changed: 75 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,13 @@ env:
22
global:
33
- TERM=dumb
44
- secure: oP/muOICK9B+4eYo8V8AQJqJ0iqy2n9s2n+5XUJPDJh04PZdG/jRp5mpoHATdSqrCEoREuvP1HAww8mNCiZRjN1pMbKE6v6LvtuRYURpm3Uctnbgf6m3pA95upcf48TsHLPr30seQge0lwR39dx+PQ0bbsfywR81MzPu+gT2ExbxMg70MOOf2tILIGAPKkk/Zishf7an17VzgFDJZLLq8fZaKFbFE5jgA5OMU7lgSUrQadhXTgRWT6kUmt7pPByovLinzBZVl/wBbyoxcxF3HSNaLcUSgWXDTDfQHeRDblS78ERtQ+ywBEN9dPv9cwTrxgZcr5laAQjIJ22HNGyLT2gxodlxRs3awp7zY2aNsdcrnbNNSTh2gfZ2r3yd/CDkuNU46W5QsfLpvEgJlacle4JM91afCoYj2OFFSx09UHfp9kPbRwuXerhgIWuYGUwQ15dXR0csxxqLJYslDK8XucKGrPIxo8gi4+/cKeKLotR7b5VXEjdrZtRfnbWU4htYMcb+1nGItKmYyK2eFb4ShOhS2lXRhEGwzAOhn8C5MGKdABpaPLcBHcAyUpGFl76B4nRU4kXKyKPKBJoBs36eZMBYgsiKwZ8UD9id0WIHLAQInbXzvh4SbmClJV4SFwcIroKkGv+iQdRvFA21d0v1teYTHAeHot4bKVGVEaODP/M=
5-
65
language: node_js
76
node_js: lts/*
8-
97
notifications:
108
email: false
119
git:
1210
quiet: true
13-
depth: 3
14-
15-
service:
16-
- xvfb
17-
11+
depth: false
1812
addons:
1913
apt:
2014
update: true
@@ -24,239 +18,240 @@ addons:
2418
- fonts-liberation
2519
- libappindicator1
2620
- google-chrome-stable
27-
2821
install: true
22+
services: xvfb
2923
before_install:
3024
- export CHROME_BIN=/usr/bin/google-chrome
3125
- export DISPLAY=:99.0
3226
#
33-
- curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
34-
- echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
35-
- sudo apt update -y || true
36-
- sudo apt install --no-install-recommends -y yarn
37-
#
3827
- export root=$(pwd)
39-
28+
- npm i -f -g -ED node-gyp
4029
jobs:
4130
include:
42-
4331
# - stage: test
4432
# node_js: lts/*
4533
# name: vue-bootstrap-css
4634
# script:
4735
# - cd ${root}/vue-bootstrap-css
48-
# - yarn -i
49-
# - yarn predeploy
50-
36+
# - npm i
37+
# - npm run predeploy
5138
- stage: test
5239
node_js: lts/*
5340
name: refs-work-natively-with-DOM-elements
5441
script:
5542
- cd ${root}/refs-work-natively-with-DOM-elements
56-
- yarn -i
57-
- yarn predeploy
43+
- npm i
44+
- npm run predeploy
5845

5946
- stage: test
6047
node_js: lts/*
6148
name: eventbus
6249
script:
6350
- cd ${root}/eventbus
64-
- yarn -i
65-
- yarn predeploy
51+
- npm i
52+
- npm run predeploy
6653

6754
- stage: test
6855
node_js: lts/*
6956
name: some-vuetify-app
7057
script:
7158
- cd ${root}/some-vuetify-app
72-
- yarn install;
73-
- yarn predeploy;
59+
- echo "TODO:\ FIXME:\ npm i fails:\ https://github.com/angular/angular/issues/13935"
60+
- npm i -f
61+
- npm run predeploy;
7462
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
75-
- yarn build --report
63+
- npm run build -- --report
7664

7765
- stage: test
7866
node_js: lts/*
7967
name: vuetify
8068
script:
8169
- cd ${root}/vuetify
82-
- yarn install;
83-
- yarn predeploy;
70+
- echo "TODO:\ FIXME:\ npm i fails:\ https://github.com/angular/angular/issues/13935"
71+
- npm i -f
72+
- npm run predeploy;
8473
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
85-
- yarn build --report
74+
- npm run build -- --report
8675

8776
- stage: test
8877
node_js: lts/*
8978
name: vuetifyjs-setup
9079
script:
9180
- cd ${root}/vuetifyjs-setup
92-
- yarn install;
93-
- yarn predeploy;
81+
- echo "TODO:\ FIXME:\ npm i fails:\ https://github.com/angular/angular/issues/13935"
82+
- npm i -f
83+
- npm run predeploy;
9484
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
95-
- yarn build --report
85+
- npm run build -- --report
9686

9787
- stage: test
9888
node_js: lts/*
9989
name: firebase-using-vuefire
10090
script:
10191
- cd ${root}/firebase-using-vuefire
102-
- yarn install;
103-
- yarn predeploy;
92+
- echo "TODO:\ FIXME:\ npm i fails:\ https://github.com/angular/angular/issues/13935"
93+
- npm i -f
94+
- npm run predeploy;
10495
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
105-
- yarn build --report
96+
- npm run build -- --report
10697

10798
- stage: test
10899
node_js: lts/*
109100
name: responsive-web-design
110101
script:
111102
- cd ${root}/responsive-web-design
112-
- yarn install;
113-
- yarn predeploy;
103+
- npm i
104+
- npm run predeploy
114105
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
115-
- yarn build --report
106+
- npm run build -- --report
116107

117108
- stage: test
118109
node_js: lts/*
119110
name: nuxt-server-side-rendering
120111
script:
121112
- cd ${root}/nuxt-server-side-rendering
122-
- yarn install;
123-
- yarn predeploy;
113+
- npm i
114+
- npm run predeploy;
124115
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
125-
- yarn build --report
116+
- npm run build -- --report
126117

127118
- stage: test
128119
node_js: lts/*
129120
name: vuex-map-getters-and-map-actions
130121
script:
131122
- cd ${root}/vuex-map-getters-and-map-actions
132-
- yarn install;
133-
- yarn predeploy;
123+
- npm run install
124+
- npm run predeploy
134125
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
135-
- yarn build --report
126+
- npm run build -- --report
136127

137128
- stage: test
138129
node_js: lts/*
139130
name: vue-material
140131
script:
141132
- cd ${root}/vue-material
142-
- yarn install;
143-
- yarn predeploy;
133+
- npm i
134+
- npm run predeploy
144135
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
145-
- yarn build --report
136+
- npm run build -- --report
146137

147138
- stage: test
148139
node_js: lts/*
149140
name: materialize-css
150141
script:
151142
- cd ${root}/materialize-css
152-
- yarn install;
153-
- yarn predeploy;
143+
- npm i
144+
- npm run predeploy
154145
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
155-
- yarn build --report
146+
- npm run build -- --report
156147

157148
- stage: test
158149
node_js: lts/*
159150
name: vuex-contact-list
160151
script:
161152
- cd ${root}/vuex-contact-list
162-
- yarn install;
163-
- yarn predeploy;
153+
- npm i
154+
- npm run predeploy
164155
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
165-
- yarn build --report
156+
- npm run build -- --report
166157

167158
- stage: test
168159
node_js: lts/*
169160
name: vuex-counter-todo
170161
script:
171162
- cd ${root}/vuex-counter-todo
172-
- yarn install;
173-
- yarn predeploy;
163+
- npm install
164+
- npm run predeploy
174165
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
175-
- yarn build --report
166+
- npm run build -- --report
176167

177168
- stage: test
178169
node_js: lts/*
179170
name: hello-vuex
180171
script:
181172
- cd ${root}/hello-vuex
182-
- yarn install;
183-
- yarn predeploy;
173+
- npm i
174+
- npm run predeploy
184175
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
185-
- yarn build --report
176+
- npm run build -- --report
186177

187178
- stage: test
188179
node_js: lts/*
189180
name: todo-list
190181
script:
191182
- cd ${root}/todo-list
192-
- yarn install;
193-
- yarn predeploy;
183+
- npm install
184+
- npm run predeploy
194185
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
195-
- yarn build --report
186+
- npm run build -- --report
196187

197188
- stage: test
198189
node_js: lts/*
199190
name: hello-world
200191
script:
201192
- cd ${root}/hello-world
202-
- yarn install;
203-
- yarn predeploy;
193+
- npm install
194+
- npm run predeploy
204195
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
205-
- yarn build --report
196+
- npm run build -- --report
206197

207198
- stage: test
208199
node_js: lts/*
209200
name: template
210201
script:
211202
- cd ${root}/template
212-
- yarn install;
213-
- yarn predeploy;
203+
- npm install
204+
- npm run predeploy
214205
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
215-
- yarn build --report
206+
- npm run build -- --report
216207

217208
- stage: test
218209
node_js: lts/*
219210
name: vuetifyjs-setup
220211
script:
221212
- cd ${root}/vuetifyjs-setup
222213
- cp firebase.js.default firebase.js || true
223-
- yarn install;
224-
- yarn predeploy;
214+
- echo "TODO:\ FIXME:\ npm i fails:\ https://github.com/angular/angular/issues/13935"
215+
- npm i -f
216+
- npm run predeploy
225217
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
226-
- yarn build --report
218+
- npm run build -- --report
227219

228220
- stage: test
229221
node_js: lts/*
230222
name: firebase-using-vuefire
231223
script:
232224
- cd ${root}/firebase-using-vuefire
233225
- cp firebase.js.default firebase.js || true
234-
- yarn install;
235-
- yarn predeploy;
226+
- echo "TODO:\ FIXME:\ npm i fails:\ https://github.com/angular/angular/issues/13935"
227+
- npm i -f
228+
- npm run predeploy
236229
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
237-
- yarn build --report
230+
- npm run build -- --report
238231

239232
- stage: test
240233
node_js: lts/*
241234
name: some-vuetify-app
242235
script:
243236
- cd ${root}/some-vuetify-app
244237
- cp firebase.config.js.default firebase.config.js || true
245-
- yarn install;
246-
- yarn predeploy;
238+
- echo "TODO:\ FIXME:\ npm i fails:\ https://github.com/angular/angular/issues/13935"
239+
- npm i -f
240+
- npm run predeploy
247241
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
248-
- yarn build --report
242+
- npm run build -- --report
249243

250244
- stage: test
251245
node_js: lts/*
252246
name: vuetify
253247
script:
254248
- cd ${root}/vuetify
255249
- cp firebase.config.js.default firebase.config.js || true
256-
- yarn install;
257-
- yarn predeploy;
250+
- echo "TODO:\ FIXME:\ npm i fails:\ https://github.com/angular/angular/issues/13935"
251+
- npm i -f
252+
- npm run predeploy
258253
- if [ -f npm-debug.log ]; then cat npm-debug.log; fi;
259-
- yarn build --report
254+
- npm run build -- --report
260255

261256
- stage: deploy
262257
jdk: openjdk11
@@ -285,8 +280,7 @@ jobs:
285280

286281
cache:
287282
npm: true
288-
yarn: true
289283
packages: true
290284
directories:
291285
- node_modules/
292-
- $HOME/.npm
286+
- ~/.n*

0 commit comments

Comments
 (0)