Skip to content

Commit

Permalink
Build system overhaul.
Browse files Browse the repository at this point in the history
  • Loading branch information
bardiharborow committed Apr 20, 2017
1 parent 9af6bf8 commit b4ac48f
Show file tree
Hide file tree
Showing 14 changed files with 1,320 additions and 1,696 deletions.
19 changes: 8 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,27 @@ node_js:
before_install:
- if [[ `npm -v` != 4* ]]; then npm install -g npm@4; 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
- echo "$TRAVIS_COMMIT_MSG" | grep '\[skip browser\]'; export TWBS_DO_BROWSER=$?; true
install:
- bundle install --deployment --jobs=3 --retry=3
- cp grunt/npm-shrinkwrap.json ./
- cp build/npm-shrinkwrap.json ./
- npm install
script:
- npm test
- if [ "$TWBS_TEST" = browser -a "$SAUCE_ACCESS_KEY" ]; then npm run js-test-cloud; fi
after_success:
- if [ "$TWBS_TEST" = sauce-js-unit ]; then grunt/upload-preview.sh; fi
- if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then npm run docs-upload-preview; fi
cache:
directories:
- node_modules
- vendor/bundle
- "$HOME/google-cloud-sdk"
env:
- TWBS_TEST=core
- TWBS_TEST=validate-html
- TWBS_TEST=sauce-js-unit
- TWBS_TEST=browser
matrix:
exclude:
- node_js: "4"
env: TWBS_TEST=validate-html
- node_js: "4"
env: TWBS_TEST=sauce-js-unit
env: TWBS_TEST=browser
notifications:
slack: heybb:iz4wwosL0N0EdaX1gvgkU0NH
webhooks:
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source 'https://rubygems.org'

group :development, :test do
gem 'jekyll', '~> 3.4.2'
gem 'jekyll', '~> 3.4.3'
gem 'jekyll-redirect-from', '~> 0.12.1'
gem 'jekyll-sitemap', '~> 1.0.0'
gem 'scss_lint', '~> 0.52.0'
gem 'jekyll-sitemap', '~> 1.1.1'
gem 'scss_lint', '~> 0.53.0'
end
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.5.0)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
colorator (1.1.0)
ffi (1.9.18)
forwardable-extended (2.6.0)
jekyll (3.4.2)
jekyll (3.4.3)
addressable (~> 2.4)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
Expand All @@ -21,7 +21,7 @@ GEM
jekyll (~> 3.3)
jekyll-sass-converter (1.5.0)
sass (~> 3.4)
jekyll-sitemap (1.0.0)
jekyll-sitemap (1.1.1)
jekyll (~> 3.3)
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
Expand All @@ -41,18 +41,18 @@ GEM
rouge (1.11.1)
safe_yaml (1.0.4)
sass (3.4.23)
scss_lint (0.52.0)
scss_lint (0.53.0)
rake (>= 0.9, < 13)
sass (~> 3.4.20)

PLATFORMS
ruby

DEPENDENCIES
jekyll (~> 3.4.2)
jekyll (~> 3.4.3)
jekyll-redirect-from (~> 0.12.1)
jekyll-sitemap (~> 1.0.0)
scss_lint (~> 0.52.0)
jekyll-sitemap (~> 1.1.1)
scss_lint (~> 0.53.0)

BUNDLED WITH
1.14.6
Loading

0 comments on commit b4ac48f

Please sign in to comment.