From 025c61b28807d0b6160bbb9d50b12ea42e881695 Mon Sep 17 00:00:00 2001 From: Brian Hann Date: Fri, 20 Dec 2013 10:10:45 -0600 Subject: [PATCH] fix(grunt): cut-release wasn't running done() --- .travis.yml | 4 ++-- Gruntfile.js | 4 ++-- TODO.md | 3 +-- lib/grunt/plugins.js | 4 +++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a86fb8e80a..13727899af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,10 +38,10 @@ script: - grunt # - git config credential.helper "store --file=.git/credentials" # - echo "https://${GITHUB_NAME}:${GITHUB_PASS}@github.com" > .git/credentials + - grunt test:ci - grunt release -after_success: - - grunt test:ci +# after_success: after_script: - ./travis_print_logs.sh \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index a28fc6c609..0708a7cf3d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -288,7 +288,7 @@ module.exports = function(grunt) { } }, - cutrelease: { + 'cut-release': { options: { cleanup: true, keepUnstable: false @@ -348,5 +348,5 @@ module.exports = function(grunt) { } }); - grunt.registerTask('release', ['clean', 'build', 'cutrelease', 'gh-pages']); + grunt.registerTask('release', ['clean', 'build', 'cut-release', 'gh-pages']); }; diff --git a/TODO.md b/TODO.md index f97c31b479..2126617b40 100644 --- a/TODO.md +++ b/TODO.md @@ -3,8 +3,7 @@ 1. `readableColumnNames` need to be overrideable by i18n. 1. Add banners to compiled .css files (grunt-banner?) 1. Add grunt-nuget task to autodeploy builds to nuget -1. Use: git describe --tags `git rev-list --tags --max-count=1` - to replace the code in utils.getVersion(); +1. Try to reomve `npm install` commands from travis before-script 1. [DONE] Add --browsers option for testing on saucelabs with specific browser(s) 1. [DONE] Make karmangular run in `watch` mode and in singlerun too. diff --git a/lib/grunt/plugins.js b/lib/grunt/plugins.js index 04d00700bd..a2b72257da 100644 --- a/lib/grunt/plugins.js +++ b/lib/grunt/plugins.js @@ -143,7 +143,7 @@ module.exports = function(grunt) { grunt.log.writeln(util.getStableVersion()); }); - grunt.registerMultiTask('cutrelease', 'Release the built code', function() { + grunt.registerMultiTask('cut-release', 'Release the built code', function() { // Require the build and ngdocs tassk to be run first grunt.task.requires(['build']); @@ -232,5 +232,7 @@ module.exports = function(grunt) { } }); }); + + done(); }); }; \ No newline at end of file