From 255f941bca0e810b28f261209cbcf905f3a6ded0 Mon Sep 17 00:00:00 2001 From: Thomas McDonald Date: Wed, 19 Aug 2015 12:54:26 -0700 Subject: [PATCH 1/8] try and install ruby --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c4fea95135..edd7824cb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,8 @@ node_js: - "0.12" before_install: - travis_retry sudo pip install -r test-infra/requirements.txt - - rvm use 1.9.3 --fuzzy + - rvm install 2.0.0 && rvm use 2.0.0 + - bundle install - export GEMDIR=$(rvm gemdir) - if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $GEMDIR) jekyll=$JEKYLL_VERSION rouge=$ROUGE_VERSION" > pseudo_Gemfile.lock; fi - "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\"" From b027b504521b9fded4d5f04c0b210fe87d31eda3 Mon Sep 17 00:00:00 2001 From: Thomas McDonald Date: Wed, 19 Aug 2015 13:08:26 -0700 Subject: [PATCH 2/8] try enabling travis-ci caching --- .travis.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index edd7824cb1..fd6489ada6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,13 @@ +sudo: false language: node_js git: depth: 10 node_js: - "0.12" before_install: - - travis_retry sudo pip install -r test-infra/requirements.txt + - export PATH=$HOME/.local/bin:$PATH + - travis_retry pip install -r test-infra/requirements.txt --user `whoami` - rvm install 2.0.0 && rvm use 2.0.0 - - bundle install - export GEMDIR=$(rvm gemdir) - if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $GEMDIR) jekyll=$JEKYLL_VERSION rouge=$ROUGE_VERSION" > pseudo_Gemfile.lock; fi - "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\"" @@ -14,12 +15,18 @@ before_install: - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?; true - if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then export TWBS_DO_VALIDATOR=0; fi install: + - bundle install --deployment --jobs=3 - npm install -g grunt-cli - - ./test-infra/s3_cache.py download npm-modules - - if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py download rubygems; fi + - npm install + # - ./test-infra/s3_cache.py download npm-modules + # - if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py download rubygems; fi after_script: - if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = core ]; then ./test-infra/s3_cache.py upload npm-modules; fi - if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi +cache: + directories: + - node_modules + - vendor/bundle env: global: - JEKYLL_VERSION="2.5.3" From 040902426663ff7401d6935fac622f0e439b8c5b Mon Sep 17 00:00:00 2001 From: Thomas McDonald Date: Thu, 20 Aug 2015 13:54:54 -0700 Subject: [PATCH 3/8] install scss-lint in system --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fd6489ada6..c01d895fe8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ before_install: - if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then export TWBS_DO_VALIDATOR=0; fi install: - bundle install --deployment --jobs=3 + - gem install scss_lint --no-rdoc --no-ri - npm install -g grunt-cli - npm install # - ./test-infra/s3_cache.py download npm-modules From be17600d7c8f582f220c3fadd065868a380ebb35 Mon Sep 17 00:00:00 2001 From: Thomas McDonald Date: Thu, 20 Aug 2015 14:09:45 -0700 Subject: [PATCH 4/8] run jekyll with bundle exec --- Gruntfile.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index b2b66855be..1d0e9efaf5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -336,7 +336,8 @@ module.exports = function (grunt) { jekyll: { options: { - config: '_config.yml' + config: '_config.yml', + bundleExec: true }, docs: {}, github: { From ec523617a3eb6da5b3e14f878931c769999f89a7 Mon Sep 17 00:00:00 2001 From: Thomas McDonald Date: Thu, 20 Aug 2015 14:13:50 -0700 Subject: [PATCH 5/8] add jekyll plugins to gemfile --- Gemfile | 1 + Gemfile.lock | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Gemfile b/Gemfile index 23068bdfeb..adfacbc160 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,7 @@ source 'https://rubygems.org' group :development, :test do gem 'jekyll', '~> 2.5.2' + gem 'jekyll-redirect-from', '~> 0.8.0' gem 'rouge', '~> 1.7.4' gem 'sass', '~> 3.4.9' gem 'scss-lint', '~> 0.31' diff --git a/Gemfile.lock b/Gemfile.lock index 725379399c..63b3f42c7f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,6 +34,8 @@ GEM coffee-script (~> 2.2) jekyll-gist (1.1.0) jekyll-paginate (1.1.0) + jekyll-redirect-from (0.8.0) + jekyll (>= 2.0) jekyll-sass-converter (1.3.0) sass (~> 3.2) jekyll-watch (1.2.0) @@ -73,6 +75,10 @@ PLATFORMS DEPENDENCIES jekyll (~> 2.5.2) + jekyll-redirect-from (~> 0.8.0) rouge (~> 1.7.4) sass (~> 3.4.9) scss-lint (~> 0.31) + +BUNDLED WITH + 1.10.5 From 1332ba3ac78fa2b9ab6112d005c0f83aa387742e Mon Sep 17 00:00:00 2001 From: Thomas McDonald Date: Mon, 24 Aug 2015 16:19:47 -0700 Subject: [PATCH 6/8] update pip installation --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c01d895fe8..9273ade7b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,7 @@ git: node_js: - "0.12" before_install: - - export PATH=$HOME/.local/bin:$PATH - - travis_retry pip install -r test-infra/requirements.txt --user `whoami` + - travis_retry pip install -r test-infra/requirements.txt --user - rvm install 2.0.0 && rvm use 2.0.0 - export GEMDIR=$(rvm gemdir) - if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $GEMDIR) jekyll=$JEKYLL_VERSION rouge=$ROUGE_VERSION" > pseudo_Gemfile.lock; fi From 0db77cc19ae388dfbeea9b72249e61294393d7a2 Mon Sep 17 00:00:00 2001 From: Thomas McDonald Date: Mon, 24 Aug 2015 16:23:00 -0700 Subject: [PATCH 7/8] remove dupe jekyll --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index bee8533276..adfacbc160 100644 --- a/Gemfile +++ b/Gemfile @@ -9,5 +9,4 @@ group :development, :test do gem 'rouge', '~> 1.7.4' gem 'sass', '~> 3.4.9' gem 'scss-lint', '~> 0.31' - gem 'jekyll-redirect-from', '~> 0.8.0' end From 757e71252f3c45f885403ef2603878ca87ca419b Mon Sep 17 00:00:00 2001 From: Thomas McDonald Date: Tue, 25 Aug 2015 09:58:32 -0700 Subject: [PATCH 8/8] strip out old caching --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9273ade7b0..37acfc02ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ 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) - - if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $GEMDIR) jekyll=$JEKYLL_VERSION rouge=$ROUGE_VERSION" > pseudo_Gemfile.lock; fi - "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 @@ -18,11 +17,6 @@ install: - gem install scss_lint --no-rdoc --no-ri - npm install -g grunt-cli - npm install - # - ./test-infra/s3_cache.py download npm-modules - # - if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py download rubygems; fi -after_script: - - if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = core ]; then ./test-infra/s3_cache.py upload npm-modules; fi - - if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi cache: directories: - node_modules