aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml1
-rw-r--r--Gruntfile.js2
-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 a5a1bac2b..387796c5f 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 e4d0e43e7..dbcf935a8 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 f83dddf9e..f83dddf9e 100644
--- a/test-infra/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json