diff --git a/lib/shell/sh-npm-publish.js b/lib/shell/sh-npm-publish.js index b3acc1a..ffb1647 100644 --- a/lib/shell/sh-npm-publish.js +++ b/lib/shell/sh-npm-publish.js @@ -4,12 +4,12 @@ module.exports = function (dep) { const { exec, logBgYellow, logYellow } = dep return function (argv) { logBgYellow('Publish dist-tag to npm') - const releaseTag = exec(`echo release-$(echo ${argv.baseTag} | cut -d '.' -f1 -f2).x`) + // const releaseTag = exec(`echo release-$(echo ${argv.baseTag} | cut -d '.' -f1 -f2).x`) const npmPackageName = exec(`echo $(node -e 'console.log(require("./package.json").name)')`).stdout const isNpmPublishSet = exec(`echo $(cat package.json | jq '.release.npmPublish')`).stdout if (isNpmPublishSet !== 'false') { - logYellow(`Add tag ${releaseTag} to npm package version ${npmPackageName}@${argv.baseTag}`) - exec(`npm dist-tag add ${npmPackageName}@${argv.baseTag} ${releaseTag} --//registry.npmjs.org/:_authToken=${argv.npmToken}`, argv.dryRun) + logYellow(`Add tag ${argv.releaseBranchName} to npm package version ${npmPackageName}@${argv.baseTag}`) + exec(`npm dist-tag add ${npmPackageName}@${argv.baseTag} ${argv.releaseBranchName} --//registry.npmjs.org/:_authToken=${argv.npmToken}`, argv.dryRun) logYellow('dist-tag to npm published') return } diff --git a/lib/shell/sh-update-package.js b/lib/shell/sh-update-package.js index 5e493d9..da85625 100644 --- a/lib/shell/sh-update-package.js +++ b/lib/shell/sh-update-package.js @@ -8,10 +8,10 @@ module.exports = function (dep) { const { exec, logBgYellow, logYellow } = dep return function (argv) { logBgYellow('Update package.json with semantic-release information') - const releaseTag = exec(`echo release-$(echo ${argv.baseTag} | cut -d '.' -f1 -f2).x`) + // const releaseTag = exec(`echo release-$(echo ${argv.baseTag} | cut -d '.' -f1 -f2).x`) exec(`cat package.json \ | jq ".release.branch=\\"${argv.releaseBranchName}\\" \ - | .publishConfig.tag=\\"${releaseTag}\\"" \ + | .publishConfig.tag=\\"${argv.releaseBranchName}\\"" \ | cat > package.json.tmp && mv package.json.tmp package.json` ) logYellow('package.json updated')