diff --git a/package-lock.json b/package-lock.json index 88584b282..d5e3d9a29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bitcore", - "version": "5.0.0-beta.19", + "version": "5.0.0-beta.20", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -465,9 +465,9 @@ } }, "bitcore-node": { - "version": "5.0.0-beta.19", - "resolved": "https://registry.npmjs.org/bitcore-node/-/bitcore-node-5.0.0-beta.19.tgz", - "integrity": "sha512-qjePgIvSwgTEcrBGBFJwpLCSAMx3wnf+sS1Twbvq9z9C0qEgXjfo3Om2fxmweH+PCdTT/38WJTxpnSUuVQ4zxg==", + "version": "5.0.0-beta.20", + "resolved": "https://registry.npmjs.org/bitcore-node/-/bitcore-node-5.0.0-beta.20.tgz", + "integrity": "sha512-L72G2y06AHkR+iM4bEEOurHhBsfw7tRJaPHvv1yfU7WiZaBJNuwKOvprdElM6bir/rx6DUlWe+A/AtXV6K3giw==", "requires": { "async": "2.5.0", "bcoin": "github:bitpay/bcoin#46ecd2c4ed3b7fbcadd9cfe10b0f5d64e4c5088d", @@ -1621,9 +1621,9 @@ "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=" }, "insight-api": { - "version": "5.0.0-beta.19", - "resolved": "https://registry.npmjs.org/insight-api/-/insight-api-5.0.0-beta.19.tgz", - "integrity": "sha512-05oymTKCo9cwAFtXtVWOg9DisUIwwWAsRGTF2zklgNTmoLzaNay2NFExf3GmkFdFmF6xeu50TksIRJ/HKI8cEw==", + "version": "5.0.0-beta.20", + "resolved": "https://registry.npmjs.org/insight-api/-/insight-api-5.0.0-beta.20.tgz", + "integrity": "sha512-SNWAbSQD/uEiDsHIbzUACdT4giIMo1tgjxPVgzIrigge5bYb70R6ScA2AxB75TBkq020tKMrHx2ZzMN4t2WGSg==", "requires": { "JSONStream": "1.3.1", "async": "2.5.0", @@ -1646,9 +1646,9 @@ } }, "insight-ui": { - "version": "5.0.0-beta.19", - "resolved": "https://registry.npmjs.org/insight-ui/-/insight-ui-5.0.0-beta.19.tgz", - "integrity": "sha512-UBtvLdVJXpd5ewTLZBUBIRt9DElAYqppvb2SACkVI69+z1wm/uv1do484s0O1h75PfEn1lOOHhdHw+vA4nPG5Q==" + "version": "5.0.0-beta.20", + "resolved": "https://registry.npmjs.org/insight-ui/-/insight-ui-5.0.0-beta.20.tgz", + "integrity": "sha512-3YVnoPaBMY+FtPNXd5YAx52PZ02ParH1jwpPg7mRPwtYe4BO5OXMp8EOvLRBg5Y4AqOlRosshmZbbG8Uriup4g==" }, "ipaddr.js": { "version": "1.4.0", diff --git a/package.json b/package.json index 2ec6a1caa..5e8cc2409 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bitcore", - "version": "5.0.0-beta.19", + "version": "5.0.0-beta.20", "description": "A platform to build bitcoin and blockchain-based applications.", "engines": { "node": ">=8.0.0" @@ -37,9 +37,9 @@ }, "dependencies": { "bitcore-lib": "5.0.0-beta.1", - "bitcore-node": "5.0.0-beta.19", - "insight-api": "5.0.0-beta.19", - "insight-ui": "5.0.0-beta.19" + "bitcore-node": "5.0.0-beta.20", + "insight-api": "5.0.0-beta.20", + "insight-ui": "5.0.0-beta.20" }, "license": "MIT", "devDependencies": { diff --git a/scripts/tag-and-release.sh b/scripts/tag-and-release.sh index 7664ec7ea..b2ab14f02 100644 --- a/scripts/tag-and-release.sh +++ b/scripts/tag-and-release.sh @@ -31,203 +31,218 @@ if [ -z "${tag}" ]; then exit 1 fi -echo "" -echo "Tagging with ${tag}..." - -echo "Assuming projects at ${HOME}/source..." ############################################# # bitcore-node ############################################# +function bitcoreNode() { + echo "" + echo "Starting with bitcore-node..." + sleep 2 + pushd "${bitcoreNodeDir}" -echo "" -echo "Starting with bitcore-node..." -sleep 2 -pushd "${bitcoreNodeDir}" + bump_version + npm install -bump_version -npm install + git add . + git diff --staged + echo "" + echo -n 'Resume?: (Y/n): ' -git add . -git diff --staged -echo "" -echo -n 'Resume?: (Y/n): ' + read ans -read ans + if [ "${ans}" == 'n' ]; then + echo "Exiting as requested." + exit 0 + fi -if [ "${ans}" == 'n' ]; then - echo "Exiting as requested." - exit 0 -fi + echo "" + echo "Committing changes for bitcore-node..." + sleep 2 + git commit -S -echo "" -echo "Committing changes for bitcore-node..." -sleep 2 -git commit -S + echo "" + echo "Pushing changes to Github..." + git push origin master && git push upstream master -echo "" -echo "Pushing changes to Github..." -git push origin master && git push upstream master - -echo "" -echo "Signing a tag" -git tag -s "${tag}" -m"${tag}" + echo "" + echo "Signing a tag" + git tag -s "${tag}" -m"${tag}" -echo "" -echo "Pushing the tag to upstream..." -git push upstream "${tag}" + echo "" + echo "Pushing the tag to upstream..." + git push upstream "${tag}" -echo "" -echo "Publishing to npm..." -npm publish --tag beta + echo "" + echo "Publishing to npm..." + npm publish --tag beta -popd + popd +} ############################################# # insight-api ############################################# +function insightApi() { + echo "" + echo "Releasing insight-api..." + sleep 2 + pushd "${insightApiDir}" -echo "" -echo "Releasing insight-api..." -sleep 2 -pushd "${insightApiDir}" + bump_version + npm install -bump_version -npm install + git add . + git diff --staged + echo "" + echo -n 'Resume?: (Y/n): ' -git add . -git diff --staged -echo "" -echo -n 'Resume?: (Y/n): ' + read ans -read ans + if [ "${ans}" == 'n' ]; then + echo "Exiting as requested." + exit 0 + fi -if [ "${ans}" == 'n' ]; then - echo "Exiting as requested." - exit 0 -fi + echo "" + echo "Committing changes for insight-api..." + sleep 2 + git commit -S -echo "" -echo "Committing changes for insight-api..." -sleep 2 -git commit -S + echo "" + echo "Pushing changes to Github..." + git push origin master && git push upstream master -echo "" -echo "Pushing changes to Github..." -git push origin master && git push upstream master - -echo "" -echo "Signing a tag" -git tag -s "${tag}" -m"${tag}" + echo "" + echo "Signing a tag" + git tag -s "${tag}" -m"${tag}" -echo "" -echo "Pushing the tag to upstream..." -git push upstream "${tag}" + echo "" + echo "Pushing the tag to upstream..." + git push upstream "${tag}" -echo "" -echo "Publishing to npm..." -npm publish --tag beta + echo "" + echo "Publishing to npm..." + npm publish --tag beta -popd + popd +} ############################################# # insight-ui ############################################# +function insightUi() { + echo "" + echo "Releasing insight-ui..." + sleep 2 + pushd "${insightUIDir}" -echo "" -echo "Releasing insight-ui..." -sleep 2 -pushd "${insightUIDir}" + bump_version + npm install -bump_version -npm install + git add . + git diff --staged + echo "" + echo -n 'Resume?: (Y/n): ' -git add . -git diff --staged -echo "" -echo -n 'Resume?: (Y/n): ' + read ans -read ans + if [ "${ans}" == 'n' ]; then + echo "Exiting as requested." + exit 0 + fi -if [ "${ans}" == 'n' ]; then - echo "Exiting as requested." - exit 0 -fi + echo "" + echo "Committing changes for insight-ui..." + sleep 2 + git commit -S -echo "" -echo "Committing changes for insight-ui..." -sleep 2 -git commit -S + echo "" + echo "Pushing changes to Github..." + git push origin master && git push upstream master -echo "" -echo "Pushing changes to Github..." -git push origin master && git push upstream master - -echo "" -echo "Signing a tag" -git tag -s "${tag}" -m"${tag}" + echo "" + echo "Signing a tag" + git tag -s "${tag}" -m"${tag}" -echo "" -echo "Pushing the tag to upstream..." -git push upstream "${tag}" + echo "" + echo "Pushing the tag to upstream..." + git push upstream "${tag}" -echo "" -echo "Publishing to npm..." -npm publish --tag beta + echo "" + echo "Publishing to npm..." + npm publish --tag beta -popd + popd +} ############################################# # bitcore ############################################# +function bitcore() { + echo "" + echo "Releasing bitcore..." + sleep 2 + pushd "${bitcoreDir}" -echo "" -echo "Releasing bitcore..." -sleep 2 -pushd "${bitcoreDir}" + bump_version + set_deps -bump_version -set_deps + npm install -npm install + git add . + git diff --staged + echo "" + echo -n 'Resume?: (Y/n): ' -git add . -git diff --staged -echo "" -echo -n 'Resume?: (Y/n): ' + read ans -read ans + if [ "${ans}" == 'n' ]; then + echo "Exiting as requested." + exit 0 + fi -if [ "${ans}" == 'n' ]; then - echo "Exiting as requested." - exit 0 + echo "" + echo "Committing changes for bitcore..." + sleep 2 + git commit -S + + echo "" + echo "Pushing changes to Github..." + git push origin master && git push upstream master + + echo "" + echo "Signing a tag" + git tag -s "${tag}" -m"${tag}" + + + echo "" + echo "Pushing the tag to upstream..." + git push upstream "${tag}" + + echo "" + echo "Publishing to npm..." + npm publish --tag beta + + popd + + echo "Completed releasing tag: ${tag}" +} + +reloases="${2}" +if [ -z "${releases}" ]; then + bitcoreNode + insightApi + insightUi + bitcore +else + eval "${releases}" fi echo "" -echo "Committing changes for bitcore..." -sleep 2 -git commit -S +echo "Tagging with ${tag}..." -echo "" -echo "Pushing changes to Github..." -git push origin master && git push upstream master - -echo "" -echo "Signing a tag" -git tag -s "${tag}" -m"${tag}" - - -echo "" -echo "Pushing the tag to upstream..." -git push upstream "${tag}" - -echo "" -echo "Publishing to npm..." -npm publish --tag beta - -popd - -echo "Completed releasing tag: ${tag}" +echo "Assuming projects at ${HOME}/source..."