From 8f844a70fef8367e53f317ab4211a220b4bba5a5 Mon Sep 17 00:00:00 2001 From: John O'Nolan Date: Mon, 17 Apr 2017 19:52:07 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=F0=9F=8F=BC=20Grunt=20master=20for?= =?UTF-8?q?=20submodules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refs #8235 - the --remote option only works if your upstream is origin - this version of the command should work for everyone --- Gruntfile.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 1eb430b890..443a850292 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -243,7 +243,9 @@ var overrides = require('./core/server/overrides'), command: function () { var upstream = grunt.option('upstream') || process.env.GHOST_UPSTREAM || 'upstream'; grunt.log.writeln('Pulling down the latest master from ' + upstream); - return 'git checkout master; git pull ' + upstream + ' master; yarn;'; + return 'git checkout master; git pull ' + upstream + ' master; ' + + 'yarn; git submodule foreach "git checkout master && git pull ' + + upstream + ' master"'; } }, @@ -310,11 +312,6 @@ var overrides = require('./core/server/overrides'), options: { params: '--init' } - }, - master: { - options: { - params: '--remote' - } } }, @@ -726,7 +723,7 @@ var overrides = require('./core/server/overrides'), // `grunt master` [`upstream` is the default upstream to pull from] // `grunt master --upstream=parent` grunt.registerTask('master', 'Update your current working folder to latest master.', - ['shell:master', 'update_submodules:master', 'subgrunt:init', 'shell:dbhealth'] + ['shell:master', 'subgrunt:init', 'shell:dbhealth'] ); // ### Release