Skip to content

Commit

Permalink
Merge pull request #587 from marmelab/no_more_bower
Browse files Browse the repository at this point in the history
[RFR] Bower is no longer necessary to the build
  • Loading branch information
fzaninotto committed Aug 5, 2015
2 parents 641c903 + f3d5541 commit 86b5260
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ before_install:
- "sh -e /etc/init.d/xvfb start"
- gem update --system
- gem install compass
- "npm install -g grunt-cli bower"
- "npm install -g grunt-cli"
- "make"
branches:
only:
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.PHONY: build

install:
bower install
npm install
./node_modules/protractor/bin/webdriver-manager update

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"style-loader": "^0.12.2",
"superagent": "^0.18.2",
"textangular": "^1.3.11",
"ui-select": "angular-ui/ui-select#v0.12.0",
"ui-select": "angular-ui/ui-select#271bf6a03078587c5afdb05f61e826573a13d348",
"underscore": "^1.8.3",
"url-loader": "^0.5.5",
"webpack": "^1.9.4",
Expand Down

0 comments on commit 86b5260

Please sign in to comment.