Merge pull request #550 from wheresrhys/release-tag

correctly use npm prerelease tag
wheresrhys · May 10, 2020 · 4f1ef07 · 4f1ef07
2 parents 3f8bbc8 + 4b3e9e9
commit 4f1ef07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -93,12 +93,7 @@ jobs:
       - restore_cache:
           key: npm-cache-{{ checksum "package-lock.json" }}
       - run: 'echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}" > ${HOME}/.npmrc'
-      - run: npm version --no-git-tag-version ${CIRCLE_TAG}
-      - run: |
-          if [ $CIRCLE_TAG ?? '-'];
-          then npm publish --access public --tag beta;
-          else npm publish --access public;
-          fi
+      - run: make publish
 
 
 workflows:

diff --git a/Makefile b/Makefile
@@ -45,3 +45,8 @@ build: transpile
 
 docs:
 	cd docs; jekyll serve build --watch
+
+NPM_PUBLISH_TAG := $(shell [[ "$(CIRCLE_TAG)" =~ -[a-z-]+ ]] && echo "pre-release" || echo "latest")
+publish:
+	npm version --no-git-tag-version $(CIRCLE_TAG)
+	npm publish --access public --tag $(NPM_PUBLISH_TAG)