From c2af4903c213d4a4d3a81363d907ad6fd4b4fea4 Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Fri, 11 Mar 2016 14:43:55 +0000 Subject: [PATCH] Fix travis forks PRs --- .travis.yml | 11 +++++------ Gruntfile.js | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 85ea64159..5388b189e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,25 +3,24 @@ language: node_js matrix: include: - node_js: "0.10" - env: TEST_COMMAND=test-with-sauce + env: SAUCE=true - node_js: "0.12" - env: TEST_COMMAND=test - node_js: "iojs" - env: TEST_COMMAND=test - node_js: "4" - env: TEST_COMMAND=test - node_js: "5" - env: TEST_COMMAND=test before_script: - npm install -g grunt-cli -script: grunt $TEST_COMMAND +script: + - grunt test + - "[ $SAUCE == false ] || [ $TRAVIS_SECURE_ENV_VARS == false ] || grunt sauce" notifications: email: false env: global: + - SAUCE=false - secure: OUooygPgokU2pa5FmVKb5tEQ+NjrUS7vr2al2MYqQDi7VOViOkKiP+1TMKDaPEo3+H3BQlsRd/HxItSCucg5Wy+45pMsTnYgR0Lsp2zmcuHmY67EPOM3B6bdCyPtB5VokrpO3O+uBTtMPAKS/sQq62gKV5Xq/K1t5CQ31EgfCd4= - secure: P/+5dvk3zwkDnUmNCEX8fgNkLAQ5s6j+dR4h3Zn5UJBBUKSZaz1QbfEX+uZ5Rn4l4aRGdvG2PGStySiS/MHmPKhWJfMMEkSFjERLUF07U2gLSkn1UOQeh0zBWIb5TehwIuuTNPmOoSE/7xgmXwF83Dq8ALjDCmo6VrtoZes9E2g= \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index 0a73d526e..347aebc11 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -24,7 +24,6 @@ module.exports = function(grunt){ grunt.registerTask('test-local', ['jshint:all', 'mochaTest:unit', 'mochaTest:acceptance', 'karma:local']); grunt.registerTask('test-local-silent', ['jshint:all', 'mochaTest:silent', 'karma:local']); grunt.registerTask('test', ['jshint:all', 'mochaTest:unit', 'mochaTest:acceptance']); - grunt.registerTask('test-with-sauce', ['test', 'sauce']); grunt.registerTask('git-stage', [ 'gitadd:versionFiles', 'gitcommit:version',