consider merged tags when evaluating changed components

mwcz · mwcz · commit 4e0735bf8f1b · 2019-09-09T14:25:50.000-04:00
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -48,7 +48,7 @@ checkoutMaster() {
 bumpVersion() {
   log "bumping version"
   OLD_VERSION=$(node -e "console.log(require('./lerna.json').version)")
-  ./node_modules/.bin/lerna version --no-git-tag-version --no-push --preid="$PRERELEASE_PREFIX" || exit 1
+  ./node_modules/.bin/lerna version --include-merged-tags --no-git-tag-version --no-push --preid="$PRERELEASE_PREFIX" || exit 1
   NEW_VERSION=$(node -e "console.log(require('./lerna.json').version)")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ checkoutMaster() {`
`48`	`48`	`bumpVersion() {`
`49`	`49`	`log "bumping version"`
`50`	`50`	`OLD_VERSION=$(node -e "console.log(require('./lerna.json').version)")`
`51`		`- ./node_modules/.bin/lerna version --no-git-tag-version --no-push --preid="$PRERELEASE_PREFIX" \|\| exit 1`
	`51`	`+ ./node_modules/.bin/lerna version --include-merged-tags --no-git-tag-version --no-push --preid="$PRERELEASE_PREFIX" \|\| exit 1`
`52`	`52`	`NEW_VERSION=$(node -e "console.log(require('./lerna.json').version)")`
`53`	`53`	`}`
`54`	`54`