Permalink
Browse files

Travis build infrastructure refresh. (#21108)

  • Loading branch information...
1 parent 4c61557 commit 5a19d4870537ca85ba38beeb7eabe80858417b72 @bardiharborow bardiharborow committed with mdo Dec 5, 2016
Showing with 11 additions and 20 deletions.
  1. +10 −16 .travis.yml
  2. +1 −4 Gruntfile.js
View
@@ -1,39 +1,33 @@
-sudo: required
+sudo: false
dist: trusty
language: node_js
git:
- depth: 10
+ depth: 3
node_js:
- "4"
- "6"
before_install:
- # Remove ./node_modules/.bin from PATH so node-which doesn't replace Unix which and cause RVM to barf. See https://github.com/travis-ci/travis-ci/issues/5092
- - export PATH=$(python -c 'from sys import argv;from collections import OrderedDict as od;print(":".join(od((p,None) for p in argv[1].split(":") if p.startswith("/")).keys()))' "$PATH")
- - rvm install 2.2
- - rvm use 2.2 --fuzzy
- - npm install -g npm@3
- - "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\""
+ - if [[ `npm -v` != 3* ]]; then npm install -g npm@3; 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
- if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then export TWBS_DO_VALIDATOR=0; fi
install:
- - bundle install --deployment --jobs=3
+ - bundle install --deployment --jobs=3 --retry=3
- cp grunt/npm-shrinkwrap.json ./
- npm install
+after_success:
+ - if [ "$TWBS_TEST" = sauce-js-unit ]; then grunt/upload-preview.sh; fi
cache:
directories:
- node_modules
- vendor/bundle
- "$HOME/google-cloud-sdk"
env:
- global:
- - NPM_CONFIG_PROGRESS="false"
- matrix:
- - TWBS_TEST=core
- - TWBS_TEST=validate-html
- - TWBS_TEST=sauce-js-unit
+ - TWBS_TEST=core
+ - TWBS_TEST=validate-html
+ - TWBS_TEST=sauce-js-unit
matrix:
- fast_finish: true
exclude:
- node_js: "4"
env: TWBS_TEST=validate-html
View
@@ -283,9 +283,6 @@ module.exports = function (grunt) {
},
htmlhint: {
command: 'npm run htmlhint'
- },
- 'upload-preview': {
- command: './grunt/upload-preview.sh'
}
},
@@ -361,7 +358,7 @@ module.exports = function (grunt) {
if (typeof process.env.SAUCE_ACCESS_KEY !== 'undefined' &&
// Skip Sauce if running a different subset of the test suite
runSubset('sauce-js-unit')) {
- testSubtasks = testSubtasks.concat(['dist', 'docs-css', 'docs-js', 'clean:docs', 'copy:docs', 'exec:upload-preview']);
+ testSubtasks = testSubtasks.concat(['dist', 'docs-css', 'docs-js', 'clean:docs', 'copy:docs']);
// Skip Sauce on Travis when [skip sauce] is in the commit message
if (isUndefOrNonZero(process.env.TWBS_DO_SAUCE)) {
testSubtasks.push('connect');

0 comments on commit 5a19d48

Please sign in to comment.