From 394c82ce2a823761e33715e432e6d10d84799eb2 Mon Sep 17 00:00:00 2001 From: LeeDr Date: Fri, 4 Dec 2015 10:17:57 -0600 Subject: [PATCH 1/3] Don't run functional UI tests on Travis, the resources are insufficient. Fixes #5569 --- tasks/travis.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/travis.js b/tasks/travis.js index b10070eb958f..3427830557bd 100644 --- a/tasks/travis.js +++ b/tasks/travis.js @@ -1,7 +1,8 @@ module.exports = function (grunt) { grunt.registerTask('travis', 'Travis CI build script', [ - 'test' + 'test:browser', + 'test:server' ]); }; From fe02d66835712d5aad78622776a74c80b18060eb Mon Sep 17 00:00:00 2001 From: LeeDr Date: Fri, 4 Dec 2015 13:50:21 -0600 Subject: [PATCH 2/3] Don't run functional UI tests on Travis (add eslint:source). Fixes #5569 --- tasks/travis.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/travis.js b/tasks/travis.js index 3427830557bd..529659b2eb23 100644 --- a/tasks/travis.js +++ b/tasks/travis.js @@ -1,6 +1,7 @@ module.exports = function (grunt) { grunt.registerTask('travis', 'Travis CI build script', [ + 'eslint:source', 'test:browser', 'test:server' ]); From e6f713ae59c0188171959bc0a398fb1cc9c39665 Mon Sep 17 00:00:00 2001 From: LeeDr Date: Fri, 4 Dec 2015 14:02:32 -0600 Subject: [PATCH 3/3] Don't run functional UI tests on Travis (add eslint:source). Fixes #5569 --- tasks/travis.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/travis.js b/tasks/travis.js index 529659b2eb23..a034818f0f3e 100644 --- a/tasks/travis.js +++ b/tasks/travis.js @@ -2,8 +2,8 @@ module.exports = function (grunt) { grunt.registerTask('travis', 'Travis CI build script', [ 'eslint:source', - 'test:browser', - 'test:server' + 'test:server', + 'test:browser' ]); };