diff options
| author | Chris Rebert <github@chrisrebert.com> | 2015-09-25 06:20:18 +0300 |
|---|---|---|
| committer | Chris Rebert <github@chrisrebert.com> | 2015-09-25 06:20:18 +0300 |
| commit | c240dd3549ea53c4d23e729ddecc88497eeed7c7 (patch) | |
| tree | 630d5f336683c89cf44d0074c173290b373b970f | |
| parent | 22c8c1e887bd6b534ca4e7eca81126bf3c7a8233 (diff) | |
| parent | 7d712bb4a564879cb4f7111459c493396e746b9a (diff) | |
Merge pull request #17688 from twbs/fix-17552
Travis: install npm dependencies using shrinkwrap
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | Gruntfile.js | 2 | ||||
| -rw-r--r-- | grunt/npm-shrinkwrap.json (renamed from test-infra/npm-shrinkwrap.json) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index a5a1bac2bc..387796c5f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ before_install: - if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then export TWBS_DO_VALIDATOR=0; fi install: - bundle install --deployment --jobs=3 + - cp grunt/npm-shrinkwrap.json ./ - npm install -g grunt-cli - npm install cache: diff --git a/Gruntfile.js b/Gruntfile.js index e4d0e43e7c..dbcf935a82 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -509,7 +509,7 @@ module.exports = function (grunt) { if (err) { grunt.fail.warn(err); } - var dest = 'test-infra/npm-shrinkwrap.json'; + var dest = 'grunt/npm-shrinkwrap.json'; fs.renameSync('npm-shrinkwrap.json', dest); grunt.log.writeln('File ' + dest.cyan + ' updated.'); done(); diff --git a/test-infra/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json index f83dddf9e4..f83dddf9e4 100644 --- a/test-infra/npm-shrinkwrap.json +++ b/grunt/npm-shrinkwrap.json |