From ed418577a0521462efc23dc30f0cea26b98c1b16 Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Tue, 26 Jan 2016 11:51:38 -0600 Subject: [PATCH] wip autocommit dist --- Gruntfile.js | 26 +++++++++----------------- package.json | 1 - 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 6e3cc402..e86fc40b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -466,31 +466,23 @@ module.exports = function (grunt) { buildcontrol: { options: { - dir: '_gh_pages', + remote: 'git@github.com:FezVrasta/bootstrap-material-design.git', commit: true, push: true, - message: 'Built %sourceName% from commit %sourceCommit% on branch %sourceBranch%' }, pages: { options: { - // FIXME: change this when we are ready!!! - //remote: 'git@github.com:FezVrasta/bootstrap-material-design.git', + // FIXME: remove this when we are ready!!! remote: 'git@github.com:rosskevin/bootstrap-material-design.git', - branch: 'gh-pages' + dir: '_gh_pages', + branch: 'gh-pages', + message: 'Built from commit %sourceCommit% on branch %sourceBranch%' } - } - }, - - gitcommit: { + }, dist: { options: { - message: 'dist - publish', - verbose: true, - noVerify: true, - noStatus: true - }, - files: { - src: ['dist/**/*'] + dir: 'dist', + message: 'dist from commit %sourceCommit% on branch %sourceBranch%' } } }, @@ -636,12 +628,12 @@ module.exports = function (grunt) { // Release and publish grunt.registerTask('prep-release', [ 'dist', - 'gitcommit:dist', 'jekyll:github' // build site from scratch //'compress' // compress zip ]); grunt.registerTask('publish', [ 'prep-release', // build all including dist, docs, site + 'buildcontrol:dist', // push dist 'buildcontrol:pages' // push site ]); //------ diff --git a/package.json b/package.json index 387eb219..9a3f9824 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "grunt-csscomb": "~3.1.0", "grunt-eslint": "^17.3.1", "grunt-exec": "~0.4.6", - "grunt-git": "^0.3.7", "grunt-html": "~5.0.0", "grunt-jekyll": "~0.4.2", "grunt-jscs": "~2.4.0",