diff --git a/.travis.yml b/.travis.yml index a01a0f02f2..fd6ae7e858 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,10 @@ node_js: - '6.10' - '7' - '8' -#matrix: -# allow_failures: -# - node_js: 7 -# - node_js: 8 +matrix: + fast_finish: true + allow_failures: + - node_js: '8' os: - linux - centos @@ -28,11 +28,11 @@ addons: - gcc-4.8 - clang before_install: - - npm i nsp -g - - npm i snyk -g + - npm install nsp -g + - npm install snyk -g - npm install protractor - - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start" + - 'export DISPLAY=:99.0' + - 'sh -e /etc/init.d/xvfb start' - 'node_modules/protractor/bin/webdriver-manager update --standalone --firefox' - 'node_modules/protractor/bin/webdriver-manager start 2>&1 &' - sleep 3 diff --git a/package.json b/package.json index 9fc68c964b..cb92fe745e 100644 --- a/package.json +++ b/package.json @@ -15,13 +15,14 @@ "npm": ">=3.10.8" }, "scripts": { - "update": "npm update && npm prune && bower install --allow-root && bower prune --allow-root", + "update": "npm update && npm prune && npm run bower", "clean": "rm -rf node_modules/ public/lib/", "reinstall": "npm cache clean && npm run clean && npm install", "start": "gulp", "start:prod": "gulp prod", "start:debug": "node-debug --web-host 0.0.0.0 server.js & gulp debug", "gulp": "gulp", + "bower": "bower install --allow-root && bower prune --allow-root", "lint": "gulp lint", "test": "gulp test", "test:server": "gulp test:server", @@ -29,7 +30,7 @@ "test:client": "gulp test:client", "test:e2e": "gulp test:e2e", "test:coverage": "gulp test:coverage", - "postinstall": "bower install --allow-root && bower prune --allow-root", + "postinstall": "npm run bower", "generate-ssl-certs": "scripts/generate-ssl-certs.sh" }, "dependencies": {