rm broken bundle update task & defunct custom RubyGem caching scheme

[skip sauce]

diff --git a/.travis.yml b/.travis.yml
index 37acfc02ae2ec5ace112d45892048d0ae62d5fdd..9bbe2e9787214b1b5bb1a3071da69c5934cde670 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@ node_js:
 before_install:
   - travis_retry pip install -r test-infra/requirements.txt --user
   - rvm install 2.0.0 && rvm use 2.0.0
-  - export GEMDIR=$(rvm gemdir)
   - "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\""
   - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip validator\]'; export TWBS_DO_VALIDATOR=$?; true
   - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?; true

diff --git a/Gruntfile.js b/Gruntfile.js
index 530867454763441192a3e89803ae864f791554dc..7babb0b93f23e801520f432030d95a974f96c93d 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -399,14 +399,6 @@ module.exports = function (grunt) {
     exec: {
       npmUpdate: {
         command: 'npm update'
-      },
-      bundleUpdate: {
-        command: function () {
-          // Update dev gems and all the test gemsets
-          return 'bundle update && ' + glob.sync('test-infra/gemfiles/*.gemfile').map(function (gemfile) {
-            return 'BUNDLE_GEMFILE=' + gemfile + ' bundle update';
-          }).join(' && ');
-        }
       }
     },
 
@@ -531,7 +523,4 @@ module.exports = function (grunt) {
       done();
     });
   });
-  // Task for updating the cached RubyGem packages used by the Travis build (which are controlled by test-infra/Gemfile.lock).
-  // This task should be run and the updated file should be committed whenever Bootstrap's RubyGem dependencies change.
-  grunt.registerTask('update-gemfile-lock', ['exec:bundleUpdate']);
 };

diff --git a/test-infra/README.md b/test-infra/README.md
index ce7d74b6583cfa9d5b2ca9cf7a637743180ea44a..5235f861cb0aee8d69f7fee68197b33ca9456d52 100644 (file)
--- 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 90eae796dc7edc75d6ad20b67709b8c3d7b4d020..5cda49a447e1346d1ecfdb3ba11326d717eaae24 100644 (file)
--- 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 (file)
index 6a83726..0000000
--- 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 (file)
index 03580d8..0000000
--- 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)