diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-11-15 21:43:54 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2018-11-15 21:43:54 +0100 |
commit | b6bb740aaf9f84144d91ec6d218ef5e40ae0c347 (patch) | |
tree | 9bb2b741d9c2e235d35986b547cb0adf6d7c4dff | |
parent | Merge branch 'chore/update-dependencies' into develop (diff) | |
download | ferdium-app-b6bb740aaf9f84144d91ec6d218ef5e40ae0c347.tar.gz ferdium-app-b6bb740aaf9f84144d91ec6d218ef5e40ae0c347.tar.zst ferdium-app-b6bb740aaf9f84144d91ec6d218ef5e40ae0c347.zip |
Switch to npm
-rw-r--r-- | .travis.yml | 10 | ||||
-rw-r--r-- | appveyor.yml | 11 |
2 files changed, 10 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 78c1e3693..28f61ac0f 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -9,12 +9,12 @@ matrix: | |||
9 | language: node_js | 9 | language: node_js |
10 | 10 | ||
11 | before_script: | 11 | before_script: |
12 | - yarn add global node-sass | 12 | - npm install node-sass -g |
13 | - yarn install | 13 | - npm ci |
14 | 14 | ||
15 | script: | 15 | script: |
16 | - yarn lint | 16 | - npm run lint |
17 | - travis_wait yarn build | 17 | - travis_wait npm run build |
18 | 18 | ||
19 | node_js: | 19 | node_js: |
20 | - '8' | 20 | - '8' |
@@ -22,7 +22,7 @@ node_js: | |||
22 | before_install: | 22 | before_install: |
23 | - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev; fi | 23 | - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev; fi |
24 | 24 | ||
25 | cache: yarn | 25 | cache: npm |
26 | 26 | ||
27 | notifications: | 27 | notifications: |
28 | email: false | 28 | email: false |
diff --git a/appveyor.yml b/appveyor.yml index 8c83a5644..351607edc 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
@@ -10,17 +10,16 @@ version: 5.0.0.{build} | |||
10 | 10 | ||
11 | install: | 11 | install: |
12 | - ps: Install-Product node 8 | 12 | - ps: Install-Product node 8 |
13 | - yarn cache clean | 13 | - npm ci |
14 | - yarn install | ||
15 | 14 | ||
16 | # cache: | 15 | cache: |
17 | # - "%LOCALAPPDATA%\\Yarn" | 16 | - '%APPDATA%\npm-cache' |
18 | 17 | ||
19 | before_build: | 18 | before_build: |
20 | - yarn lint | 19 | - npm run lint |
21 | 20 | ||
22 | build_script: | 21 | build_script: |
23 | - yarn build | 22 | - npm run build |
24 | 23 | ||
25 | notifications: | 24 | notifications: |
26 | - provider: Slack | 25 | - provider: Slack |