From 6f95873c6cd3abaa85683662b5d931d747716a5f Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Mon, 16 Nov 2020 16:21:40 -0600 Subject: [PATCH] fix: beta/release versioning --- .github/workflows/beta-publish.yml | 4 ++-- .github/workflows/release-publish.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/beta-publish.yml b/.github/workflows/beta-publish.yml index 82dcf91..302c228 100644 --- a/.github/workflows/beta-publish.yml +++ b/.github/workflows/beta-publish.yml @@ -27,8 +27,8 @@ jobs: yarn lint # Uncomment for NPM publishing. - VERSION=`cat lerna.json | grep '"version":' | awk '{ print $2 }' | sed 's/[",]//g'` - yarn lerna version $VERSION --no-git-tag-version -y + VERSION="`cat lerna.json | grep '"version":' | awk '{ print $2 }' | sed 's/[",]//g' | sed 's/-[a-z]*\./-beta./'`" + yarn lerna version ${VERSION} --no-git-tag-version -y git commit -am "v$VERSION" git push git tag -f "v$VERSION" diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index 3c597b2..069ac4c 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -27,7 +27,7 @@ jobs: yarn lint # Uncomment for NPM publishing. - VERSION=`cat lerna.json | grep '"version":' | awk '{ print $2 }' | sed 's/[",]//g'` + VERSION="`cat lerna.json | grep '"version":' | awk '{ print $2 }' | sed 's/[",]//g' | cut -d'-' -f1`" yarn lerna version $VERSION --no-git-tag-version -y git commit -am "v$VERSION" git push