Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Commit

Permalink
Merge pull request #2 from swilliamset/interactivellama_release-all-t…
Browse files Browse the repository at this point in the history 
…he-things

linting
  • Loading branch information
@interactivellama
interactivellama committed Jun 3, 2015
2 parents b7a05c5 + 4a6bfc4 commit 7db8d56
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ module.exports = function (grunt) {
}
},
shell: {
// Compile release notes while waiting for tests to pass. Needs Ruby gem.
// Compile release notes while waiting for tests to pass. Needs Ruby gem.
// Install with: gem install github_changelog_generator
notes: {
command: 'github_changelog_generator --no-author --unreleased-only --compare-link'
Expand All @@ -456,9 +456,9 @@ module.exports = function (grunt) {
'git checkout master',
'git pull origin master',
'git checkout ' + grunt.config('majorReleaseBranch'),
'git pull origin ' + grunt.config('majorReleaseBranch'),
'git pull origin ' + grunt.config('majorReleaseBranch'),
'git merge master '
].join(' && ')
].join(' && ');
grunt.log.write(command);
return command;
}
Expand All @@ -469,7 +469,7 @@ module.exports = function (grunt) {
var command = [
'git checkout ' + grunt.config('minorReleaseBranch'),
'git pull origin ' + grunt.config('minorReleaseBranch')
].join(' && ')
].join(' && ');
grunt.log.write(command);
return command;
}
Expand All @@ -478,7 +478,7 @@ module.exports = function (grunt) {
command: function() {
var command = [
'git add dist README.md DETAILS.md bower.json package.json'
].join(' && ')
].join(' && ');
grunt.log.write(command);
return command;
}
Expand All @@ -487,7 +487,7 @@ module.exports = function (grunt) {
command: function() {
var command = [
'git commit -m "release ' + grunt.config('pkg.version') + '"'
].join(' && ')
].join(' && ');
grunt.log.write(command);
return command;
}
Expand All @@ -496,7 +496,7 @@ module.exports = function (grunt) {
command: function() {
var command = [
'git tag -a "' + grunt.config('pkg.version') + '" -m "' + grunt.config('pkg.version') + '"'
].join(' && ')
].join(' && ');
grunt.log.write(command);
return command;
}
Expand All @@ -505,7 +505,7 @@ module.exports = function (grunt) {
command: function() {
var command = [
'git push origin ' + grunt.config('majorReleaseBranch')
].join(' && ')
].join(' && ');
grunt.log.write(command);
return command;
}
Expand All @@ -515,7 +515,7 @@ module.exports = function (grunt) {
command: function() {
var command = [
'git push origin ' + grunt.config('minorReleaseBranch')
].join(' && ')
].join(' && ');
grunt.log.write(command);
return command;
}
Expand All @@ -524,7 +524,7 @@ module.exports = function (grunt) {
command: function() {
var command = [
'git push origin ' + packageVersion
].join(' && ')
].join(' && ');
grunt.log.write(command);
return command;
}
Expand All @@ -533,7 +533,7 @@ module.exports = function (grunt) {
command: function() {
var command = [
'git push origin ' + grunt.config('majorReleaseBranch') + ':master'
].join(' && ')
].join(' && ');
grunt.log.write(command);
return command;
}
Expand All @@ -542,7 +542,7 @@ module.exports = function (grunt) {
command: function() {
var command = [
'git merge ' + grunt.config('minorReleaseBranch')
].join(' && ')
].join(' && ');
grunt.log.write(command);
return command;
}
Expand All @@ -552,7 +552,7 @@ module.exports = function (grunt) {
command: function() {
var command = [
'git push origin master'
].join(' && ')
].join(' && ');
grunt.log.write(command);
return command;
}
Expand All @@ -563,7 +563,7 @@ module.exports = function (grunt) {
var command = [
'git checkout master',
'git pull origin master'
].join(' && ')
].join(' && ');
grunt.log.write(command);
return command;
}
Expand All @@ -572,11 +572,11 @@ module.exports = function (grunt) {
command: function() {
var command = [
'mv dist ' + '<%= pkg.version %>',
'scp -i ~/.ssh/fuelcdn -r "' + '<%= pkg.version %>' + '"/ ' +
'scp -i ~/.ssh/fuelcdn -r "' + '<%= pkg.version %>' + '"/ ' +
'<%= cdnLoginFile.user %>' + '@' + '<%= cdnLoginFile.server %>' + ':' + '<%= cdnLoginFile.folder %>',
'mv "' + '<%= pkg.version %>' + '" dist',
'echo "Done uploading files."'
].join(' && ')
].join(' && ');
grunt.log.write(command);
return command;
}
Expand Down Expand Up @@ -779,10 +779,10 @@ module.exports = function (grunt) {
grunt.task.run(['shell:checkoutPatchBranch']);
}
else if (grunt.config('releaseTask') === 'minor') {
grunt.task.run(['shell:mergeLocalMasterAndMinorBranch']);
grunt.task.run(['shell:mergeLocalMasterAndMinorBranch']);
}

grunt.task.run(['releasetest', 'clean:screenshots',
grunt.task.run(['releasetest', 'clean:screenshots',
'bump-only:' + grunt.config('releaseTask'), 'replace:readme', 'dist']);
}
else if(task === 'commit') {
Expand All @@ -792,11 +792,11 @@ module.exports = function (grunt) {
grunt.task.run(['shell:tag']);
}
else if(task === 'pushPatchBranchToOrigin') {
grunt.task.run(['shell:pushLocalPatchBranchToOrigin', 'shell:pushTagToOrigin', 'shell:pullOriginMasterToLocal',
grunt.task.run(['shell:pushLocalPatchBranchToOrigin', 'shell:pushTagToOrigin', 'shell:pullOriginMasterToLocal',
'shell:mergeLocalPatchBranchToHead', 'shell:pushLocalMasterToOriginMaster']);
}
else if(task === 'pushMinorBranchToOrigin') {
grunt.task.run(['shell:pushLocalPatchBranchToOrigin', 'shell:pushTagToOrigin', 'shell:pushLocalPatchBranchToOriginMaster',
grunt.task.run(['shell:pushLocalPatchBranchToOrigin', 'shell:pushTagToOrigin', 'shell:pushLocalPatchBranchToOriginMaster',
'shell:pullOriginMasterToLocal']);
}
else if(task === 'upload') {
Expand All @@ -819,7 +819,7 @@ module.exports = function (grunt) {
grunt.task.run(['shell:checkoutPatchBranch']);
}
else if (grunt.config('releaseTask') === 'minor') {
grunt.task.run(['shell:checkoutminorBranch']);
grunt.task.run(['shell:checkoutminorBranch']);
}


Expand Down

0 comments on commit 7db8d56

Please sign in to comment.