Skip to content

Commit

Permalink
Merge pull request #186 from sandersky/master
Browse files Browse the repository at this point in the history
Batten down the hatches
  • Loading branch information
sandersky committed Aug 30, 2016
2 parents 674b1ee + 9670107 commit 73fbcde
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ branches:
- /^v[0-9\.]+/
before_install:
- npm config set spin false
- npm install -g coveralls pr-bumper
- npm install -g coveralls pr-bumper --ignore-scripts
- pr-bumper check
install:
- npm install
- npm install ember-cli-sass # NOTE: this requies scripts
- npm install --ignore-scripts
- bower install
before_script:
- "export DISPLAY=:99.0"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ The following components are available when you install ember-frost-core
```bash
git clone git@github.com:ciena-frost/ember-frost-core.git
cd ember-frost-core
npm install && bower install
npm install ember-cli-sass && npm install --ignore-scripts && bower install
```

### Development Server
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
"ember-cli-string-utils": "^1.0.0",
"ember-cli-valid-component-name": "^1.0.0",
"ember-prop-types": "^2.1.0",
"npm-install-security-check": "^1.0.0",
"svg4everybody": "^2.0.3"
},
"ember-addon": {
Expand All @@ -167,4 +168,4 @@
],
"configPath": "tests/dummy/config"
}
}
}

0 comments on commit 73fbcde

Please sign in to comment.