Update to latest gulp-git-streamed and remove publish workaround code.

This commit is contained in:
Jürg Lehni 2016-07-03 12:17:37 +02:00
parent c942239032
commit cfa215051d
2 changed files with 2 additions and 4 deletions
gulp/tasks

View file

@ -37,9 +37,7 @@ gulp.task('publish:release', function() {
.pipe(git.tag('v' + options.version, message))
.pipe(git.checkout('master'))
.pipe(git.merge('develop', { args: '-X theirs' }))
.pipe(git.push('origin', 'master' ))
.pipe(git.push('origin', 'develop' ))
.pipe(git.push(null, null, { args: '--tags' } ))
.pipe(git.push('origin', ['master', 'develop'], { args: '--tags' }))
.pipe(shell('npm publish'))
.pipe(git.checkout('develop'));
});