From f3532c4deff6b0476d71b957c903c04c8446ff89 Mon Sep 17 00:00:00 2001 From: SergioCrisostomo Date: Wed, 12 Mar 2014 20:53:51 +0100 Subject: [PATCH] Add matrix to Travis Adding `matrix` to travis testing will allow Travis to parallel test different builds in separate processes. --- .travis.yml | 3 +++ Gruntfile.js | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0d51de1..842ca7c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,9 @@ language: node_js node_js: - 0.11 env: + matrix: + - BUILD='nocompat' + - BUILD='default' global: - secure: Y3xG8HHMX3rKYqG+OmucEHXSbC2JojqLd1ZijcR2D/Ca7t09kAGpqOHBu+j8wFCj6FZOUcMLQS3f7OygTelyvNGPMlhb0Wx1OCR4Cuj4UQjkXQebHbzMn+f4JXDgXWCEgczFv4joQw9ERGFSIOxZ75jed6bO09a1q9EDMlxHPBI= - secure: FabKSSkcb1n1N2S9esOhD/dziZZ3RzYYzCxHqL2EUe3E6WpkjK/m6ZuCu/3e76u35s2uUqpBOoJawC/eiQiJrMhGxpFMpTNI3133wSf/iCA7LDv5G5RWxYQMtwSwjKUwM2WzV3dtUfzLbqj9H/XZT1Q/wf+/NQvFWFljG5XyktU= diff --git a/Gruntfile.js b/Gruntfile.js index eb3de687..2f0781b8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -257,12 +257,17 @@ module.exports = function(grunt) { } }); + var travisBuild = process.env.BUILD; var pullRequest = process.env.TRAVIS_PULL_REQUEST; - var tasks = ['clean', 'packager:all', 'packager:specs']; - var sauceTasks = ['karma:sauce1', 'karma:sauce2', 'karma:sauce3', 'karma:sauce4', 'karma:sauce5', 'karma:sauce6']; + + var compatBuild = ['clean', 'packager:all', 'packager:specs']; + var nocompatBuild = ['clean', 'packager:nocompat', 'packager:specs-nocompat']; + var sauceTasks = ['karma:sauce1', 'karma:sauce2', 'karma:sauce3', 'karma:sauce4', 'karma:sauce5', 'karma:sauce6']; + + var tasks = travisBuild == 'compat' ? compatBuild : nocompatBuild; tasks = pullRequest != 'false' ? tasks.concat('karma:continuous') : tasks.concat(sauceTasks); - grunt.registerTask('default', ['clean', 'packager:all', 'packager:specs', 'karma:continuous']); - grunt.registerTask('nocompat', ['clean', 'packager:nocompat', 'packager:specs-nocompat', 'karma:continuous']); + grunt.registerTask('default', compatBuild); + grunt.registerTask('nocompat', nocompatBuild); grunt.registerTask('default:travis', tasks); }; -- 2.11.4.GIT