diff --git a/.travis.yml b/.travis.yml index 6bd041ad..37eab2ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ before_install: - "sh -e /etc/init.d/xvfb start" - gem update --system - gem install compass - - "npm install -g grunt-cli" before_script: - "./node_modules/protractor/bin/webdriver-manager update" branches: diff --git a/Makefile b/Makefile index 8bd2d79a..497e9a60 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ install: ./node_modules/protractor/bin/webdriver-manager update run: - @grunt + @./node_modules/.bin/grunt build: @NODE_ENV=production ./node_modules/webpack/bin/webpack.js -p --optimize-minimize --optimize-occurence-order --optimize-dedupe --progress --devtool source-map @@ -13,4 +13,4 @@ build: @echo "Files build/ng-admin.min.css and build/ng-admin.min.js updated (with minification)" test: - @grunt test:local + @./node_modules/.bin/grunt test:local diff --git a/README.md b/README.md index b688a37c..7b2114ee 100644 --- a/README.md +++ b/README.md @@ -203,7 +203,7 @@ make test **Tip:** If you are working on Karma tests, you can prevent from relaunching the whole process by disabling single-run: ``` -KARMA_SINGLE_RUN=false grunt karma:unit +KARMA_SINGLE_RUN=false ./node_modules/.bin/grunt karma:unit ``` ### Releasing diff --git a/package.json b/package.json index 1e0fb7a3..365e5758 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "font-awesome": "^4.3.0", "grunt": "~0.4.4", "grunt-babel": "^4.0.0", + "grunt-cli": "^0.1.13", "grunt-concurrent": "^0.5.0", "grunt-contrib-clean": "^0.6.0", "grunt-contrib-compass": "~0.7.2",