diff --git a/Dockerfile b/Dockerfile index adfa4d9..543d61a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ FROM node:10-slim -FROM mikeal/dev:latest LABEL version="1.0.0" LABEL repository="http://github.com/mikeal/merge-release" diff --git a/cli.js b/cli.js index 10f31d4..a476e94 100644 --- a/cli.js +++ b/cli.js @@ -28,7 +28,8 @@ process.stdout.write(execSync(`npm version --allow-same-version=true --git-tag-v let newVersion = execSync(`npm version --git-tag-version=false ${version}`).toString() console.log(newVersion) process.stdout.write(execSync(`npm publish --access=public`)) +/* process.stdout.write(execSync(`git tag -a ${newVersion} -m "Created by merge-release.\n\n##Changelog:\n${messages.join('\n')}"`)) process.stdout.write(execSync(`git push --tags`)) - +*/ // npm version minor && npm publish --access=public && git push --tags