tqt/Ghost
2
1
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2023-12-13 21:00:40 +01:00
Code Issues 1 Releases Wiki Activity

👌🏼 Grunt master for submodules

Browse source 
refs #8235

- the --remote option only works if your upstream is origin
- this version of the command should work for everyone
This commit is contained in:
John O'Nolan 2017-04-17 19:52:07 +01:00
parent 1ccea56370
commit 8f844a70fe
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Gruntfile.js
View file

@ -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