zcash-hackworks
/
bitcore-build-zcash
mirror of https://github.com/zcash-hackworks/bitcore-build-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #18 from maraoz/master 

bower build bugfix
This commit is contained in:
Manuel Aráoz 2015-01-22 14:21:26 -03:00
parent ce4dd67558 3a8bac2f72
commit ac6a0ef79c
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
index.js
View File

@ -223,12 +223,6 @@ function startGulp(name, opts) {
}); });
}); });
gulp.task('release:merge-master', function(cb) {
git.merge('master', {
args: ''
}, cb);
});
gulp.task('release:checkout-master', function(cb) { gulp.task('release:checkout-master', function(cb) {
git.checkout('master', { git.checkout('master', {
args: '' args: ''
@ -289,12 +283,12 @@ function startGulp(name, opts) {
return runsequence( return runsequence(
// Checkout the release temporal branch // Checkout the release temporal branch
'release:checkout-releases', 'release:checkout-releases',
// Merge the master branch
'release:merge-master',
// Run npm install // Run npm install
'release:install', 'release:install',
// Run tests with gulp test // Run tests with gulp test
'test', 'test',
// build browser files
'browser',
// Update package.json and bower.json // Update package.json and bower.json
bumper, bumper,
// Commit // Commit

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "bitcore-build", "name": "bitcore-build",
"version": "0.5.2", "version": "0.5.3",
"description": "A helper for common tasks to build bitcore modules'", "description": "A helper for common tasks to build bitcore modules'",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {