scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2024-12-29 09:22:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gulp/tasks/publish.js
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'));
});

2
package.json
View file

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