Skip to content

Commit

Permalink
Merge pull request #640 from marmelab/local_grunt
Browse files Browse the repository at this point in the history
[RFR] Use local grunt instead of global
  • Loading branch information
fzaninotto committed Sep 1, 2015
2 parents 18d290b + d168f41 commit 8d7b72a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ 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
@cp -Rf build examples/blog/
@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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 8d7b72a

Please sign in to comment.