Merge branch 'v4-dev' into v4-media-breakpoint-between

4 files changed, 2 insertions, 32 deletions

diff --git a/test-infra/README.md b/test-infra/README.md
index ce7d74b65..5235f861c 100644
--- a/test-infra/README.md
+++ b/test-infra/README.md
@@ -13,16 +13,13 @@ Similar to git, `s3_cache.py` makes the assumption that [SHA-256 will effectivel
 
 
 ### For Bootstrap specifically
-`s3_cache.py` is used to cache the npm packages that our Grunt tasks depend on and the RubyGems that Jekyll depends on. (Jekyll is needed to compile our docs to HTML so that we can run them thru an HTML5 validator.)
+`s3_cache.py` is used to cache the npm packages that our Grunt tasks depend on.
 
 For npm, the `node_modules` directory is cached based on our `npm-shrinkwrap.json` file.
 
-For RubyGems, the `gemdir` of the current RVM-selected Ruby is cached based on the `pseudo_Gemfile.lock` file generated by our Travis build script.
-`pseudo_Gemfile.lock` contains the versions of Ruby and Jekyll that we're using (read our `.travis.yml` for details).
-
 
 ## Why is `s3_cache.py` necessary?
-`s3_cache.py` is used to speed up Bootstrap's Travis builds. Installing npm packages and RubyGems used to take up a significant fraction of our total build times. Also, at the time that `s3_cache.py` was written, npm was occasionally unreliable.
+`s3_cache.py` is used to speed up Bootstrap's Travis builds. Installing npm packages used to take up a significant fraction of our total build times. Also, at the time that `s3_cache.py` was written, npm was occasionally unreliable.
 
 Travis does offer built-in caching on their paid plans, but this do-it-ourselves S3 solution is significantly cheaper since we only need caching and not Travis' other paid features.
 
diff --git a/test-infra/S3Cachefile.json b/test-infra/S3Cachefile.json
index 90eae796d..5cda49a44 100644
--- a/test-infra/S3Cachefile.json
+++ b/test-infra/S3Cachefile.json
@@ -3,10 +3,5 @@
         "key": "./npm-shrinkwrap.json",
         "cache": "../node_modules",
         "generate": "./uncached-npm-install.sh"
-    },
-    "rubygems": {
-        "key": "$BUNDLE_GEMFILE",
-        "cache": "../vendor/cache",
-        "generate": "cd .. ; bundle install --path=\"`pwd`/vendor/cache\""
     }
 }
diff --git a/test-infra/gemfiles/core.gemfile b/test-infra/gemfiles/core.gemfile
deleted file mode 100644
index 6a8372691..000000000
--- a/test-infra/gemfiles/core.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# Ruby Gems for the 'core' set of tests
-# Run `grunt update-gemfile-lock` to update to the latest compatible versions
-
-source 'https://rubygems.org'
-
-gem 'sass', '~> 3.4.9'
-gem 'scss-lint', '~> 0.31'
diff --git a/test-infra/gemfiles/core.gemfile.lock b/test-infra/gemfiles/core.gemfile.lock
deleted file mode 100644
index 03580d83b..000000000
--- a/test-infra/gemfiles/core.gemfile.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    rainbow (2.0.0)
-    sass (3.4.9)
-    scss-lint (0.31.0)
-      rainbow (~> 2.0)
-      sass (~> 3.4.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  sass (~> 3.4.9)
-  scss-lint (~> 0.31)