diff --git a/.travis.yml b/.travis.yml index 47e28bf232..be63538028 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,19 @@ language: node_js node_js: - 0.10 before_install: - - time sudo pip install --use-mirrors -r ./test-infra/requirements.txt + - time sudo pip install --use-mirrors -r test-infra/requirements.txt + - rvm use 1.9.3 --fuzzy + - if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $(rvm gemdir)) jekyll=$JEKYLL_VERSION" > pseudo_Gemfile.lock; fi install: - - if [ "$TWBS_TEST" = validate-html ]; then time gem install jekyll; fi - time npm install -g grunt-cli - - time ./test-infra/node_modules_cache.py download package.json ./node_modules || time npm install + - time ./test-infra/s3_cache.py download 'node.js packages' package.json ./node_modules || time npm install + - if [ "$TWBS_TEST" = validate-html ]; then time ./test-infra/s3_cache.py download rubygems pseudo_Gemfile.lock $(rvm gemdir) || gem install -N jekyll -v $JEKYLL_VERSION; fi after_script: - - if [ "$TWBS_TEST" = core ]; then time ./test-infra/node_modules_cache.py upload package.json ./node_modules; fi + - if [ "$TWBS_TEST" = core ]; then time ./test-infra/s3_cache.py upload 'node.js packages' package.json ./node_modules; fi + - if [ "$TWBS_TEST" = validate-html ]; then time ./test-infra/s3_cache.py upload rubygems pseudo_Gemfile.lock $(rvm gemdir); fi env: global: + - JEKYLL_VERSION: 1.4.1 - SAUCE_USERNAME: bootstrap - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ=" - secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY=" diff --git a/Gruntfile.js b/Gruntfile.js index d350ce3ad6..5ba8abbfb9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -195,6 +195,7 @@ module.exports = function (grunt) { options: { charset: 'utf-8', doctype: 'HTML5', + failHard: true, reset: true, relaxerror: [ 'Bad value X-UA-Compatible for attribute http-equiv on element meta.', @@ -238,90 +239,7 @@ module.exports = function (grunt) { build: process.env.TRAVIS_JOB_ID, concurrency: 3, urls: ['http://127.0.0.1:3000/js/tests/index.html'], - browsers: [ - // See https://saucelabs.com/docs/platforms/webdriver - { - browserName: 'safari', - version: '7', - platform: 'OS X 10.9' - }, - { - browserName: 'chrome', - version: '31', - platform: 'OS X 10.9' - }, - /* FIXME: currently fails 1 tooltip test - { - browserName: 'firefox', - version: '25', - platform: 'OS X 10.6' - },*/ - // Mac Opera not currently supported by Sauce Labs - /* FIXME: currently fails 1 tooltip test - { - browserName: 'internet explorer', - version: '11', - platform: 'Windows 8.1' - },*/ - /* - { - browserName: 'internet explorer', - version: '10', - platform: 'Windows 8' - }, - { - browserName: 'internet explorer', - version: '9', - platform: 'Windows 7' - }, - { - browserName: 'internet explorer', - version: '8', - platform: 'Windows 7' - }, - {// unofficial - browserName: 'internet explorer', - version: '7', - platform: 'Windows XP' - }, - */ - { - browserName: 'chrome', - version: '31', - platform: 'Windows 8.1' - }, - { - browserName: 'firefox', - version: '25', - platform: 'Windows 8.1' - }, - // Win Opera 15+ not currently supported by Sauce Labs - { - browserName: 'iphone', - version: '6.1', - platform: 'OS X 10.8' - }, - // iOS Chrome not currently supported by Sauce Labs - // Linux (unofficial) - { - browserName: 'chrome', - version: '30', - platform: 'Linux' - }, - { - browserName: 'firefox', - version: '25', - platform: 'Linux' - } - // Android Chrome not currently supported by Sauce Labs - /* Android Browser (super-unofficial) - { - browserName: 'android', - version: '4.0', - platform: 'Linux' - } - */ - ], + browsers: grunt.file.readYAML('sauce_browsers.yml') } } } diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html index 6c041eef38..96e175dd2d 100644 --- a/_includes/nav-getting-started.html +++ b/_includes/nav-getting-started.html @@ -32,7 +32,7 @@
  • - Browser and device support + Browser and device support