From cfa215051d7d686fadb10c746b6bc765db82dc03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Lehni?= <juerg@scratchdisk.com>
Date: Sun, 3 Jul 2016 12:17:37 +0200
Subject: [PATCH] Update to latest gulp-git-streamed and remove publish
workaround code.
---
gulp/tasks/publish.js | 4 +---
package.json | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/gulp/tasks/publish.js b/gulp/tasks/publish.js
index 8411ce0b..588520e7 100644
--- a/gulp/tasks/publish.js
+++ b/gulp/tasks/publish.js
@@ -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'));
});
diff --git a/package.json b/package.json
index 21faf4a7..3be0b94c 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"gulp-add-src": "^0.2.0",
"gulp-bump": "^1.0.0",
"gulp-cached": "^1.1.0",
- "gulp-git-streamed": "^1.0.0",
+ "gulp-git-streamed": "^1.8.0",
"gulp-jshint": "^2.0.0",
"gulp-prepro": "^2.4.0",
"gulp-qunits": "^2.0.1",