From 1f6f95a245e613873b822fbcaba4fa78112c57b4 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 8 Dec 2014 14:58:06 -0800 Subject: grunt-saucelabs now uses `throttled` instead of `concurrency` [skip validator] --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 5f7b6b342..cefef94d5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -370,7 +370,7 @@ module.exports = function (grunt) { all: { options: { build: process.env.TRAVIS_JOB_ID, - concurrency: 10, + throttled: 10, maxRetries: 3, urls: ['http://127.0.0.1:3000/js/tests/index.html'], browsers: grunt.file.readYAML('grunt/sauce_browsers.yml') -- cgit v1.2.3 From 71f6dd25fc30c52c93fdb90fd6cb145593cdf2ee Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 2 Dec 2014 13:50:20 +0200 Subject: Add grunt-contrib-compress. Now, the zip file is created when running `grunt prep-release`. [ci skip] --- Gruntfile.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index cefef94d5..9cd42e9c8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -382,7 +382,27 @@ module.exports = function (grunt) { npmUpdate: { command: 'npm update' } + }, + + compress: { + main: { + options: { + archive: 'bootstrap-<%= pkg.version %>-dist.zip', + mode: 'zip', + level: 9, + pretty: true + }, + files: [ + { + expand: true, + cwd: 'dist/', + src: ['**'], + dest: 'bootstrap-<%= pkg.version %>-dist' + } + ] + } } + }); @@ -465,7 +485,7 @@ module.exports = function (grunt) { grunt.registerTask('lint-docs-js', ['jshint:assets', 'jscs:assets']); grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-customizer']); - grunt.registerTask('docs-github', ['jekyll:github']); + grunt.registerTask('prep-release', ['jekyll:github', 'compress']); // Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json). // This task should be run and the updated file should be committed whenever Bootstrap's dependencies change. -- cgit v1.2.3 From f91071bc1bb0cb0999739d62dd46d18727312165 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 28 Dec 2014 19:58:29 -0800 Subject: Bump grunt-contrib-cssmin to ~0.11.0 --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 9cd42e9c8..ca6bed5f1 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -224,7 +224,7 @@ module.exports = function (grunt) { options: { compatibility: 'ie8', keepSpecialComments: '*', - noAdvanced: true + advanced: false }, minifyCore: { src: 'dist/css/<%= pkg.name %>.css', -- cgit v1.2.3 From 96e108f2b27a5a7f6ffc72dfd083171d07c8aa70 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 29 Dec 2014 16:54:29 -0800 Subject: Revert "remove Glyphicons docs autogeneration from Grunt" This reverts commit 36b530892600648a6d6a24dd2520f84839cc0ace. This reverts PR #14065. Turns out Glyphicons is more active than we'd thought. --- Gruntfile.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 9cd42e9c8..248cf71ad 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -18,6 +18,7 @@ module.exports = function (grunt) { var fs = require('fs'); var path = require('path'); var npmShrinkwrap = require('npm-shrinkwrap'); + var generateGlyphiconsData = require('./grunt/bs-glyphicons-data-generator.js'); var BsLessdocParser = require('./grunt/bs-lessdoc-parser.js'); var getLessVarsData = function () { var filePath = path.join(__dirname, 'less/variables.less'); @@ -464,6 +465,8 @@ module.exports = function (grunt) { // This can be overzealous, so its changes should always be manually reviewed! grunt.registerTask('change-version-number', 'sed'); + grunt.registerTask('build-glyphicons-data', function () { generateGlyphiconsData.call(this, grunt); }); + // task for building customizer grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']); grunt.registerTask('build-customizer-html', 'jade'); @@ -483,7 +486,7 @@ module.exports = function (grunt) { grunt.registerTask('lint-docs-css', ['csslint:docs', 'csslint:examples']); grunt.registerTask('docs-js', ['uglify:docsJs', 'uglify:customize']); grunt.registerTask('lint-docs-js', ['jshint:assets', 'jscs:assets']); - grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-customizer']); + grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-glyphicons-data', 'build-customizer']); grunt.registerTask('prep-release', ['jekyll:github', 'compress']); -- cgit v1.2.3 From 576230b92ae5a082eb8e058dc2fab7c67c99bd19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 1 Jan 2015 01:23:48 +0100 Subject: Happy New Year :santa: --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 30a945a4a..4c6c8c9c4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,7 +1,7 @@ /*! * Bootstrap's Gruntfile * http://getbootstrap.com - * Copyright 2013-2014 Twitter, Inc. + * Copyright 2013-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -- cgit v1.2.3 From 9d0f6c05f423347356876d5a5478ef4b74eacd24 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 5 Jan 2015 12:40:43 -0800 Subject: Sauce testing: set maxPollRetries to 4 for increased robustness --- Gruntfile.js | 1 + 1 file changed, 1 insertion(+) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 4c6c8c9c4..de945ab3c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -373,6 +373,7 @@ module.exports = function (grunt) { build: process.env.TRAVIS_JOB_ID, throttled: 10, maxRetries: 3, + maxPollRetries: 4, urls: ['http://127.0.0.1:3000/js/tests/index.html'], browsers: grunt.file.readYAML('grunt/sauce_browsers.yml') } -- cgit v1.2.3