diff --git a/.circleci/config.yml b/.circleci/config.yml index 56c1ac941..4a4f84b7c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,9 +77,13 @@ jobs: root: ~/repo paths: . - ################## + ### + # NPM PUBLISH: Master # - ################## + # - Semantic release runs checks + # - Changelog and version are added to GitHub + # - NPM package is released using calculated new version + ### publish_npm: <<: *defaults steps: @@ -141,27 +145,6 @@ workflows: - test_and_report - build - ### - # MERGE: VERSION BRANCHES - ### - # test_build_deploy: - # jobs: - # - checkout_code: - # filters: - # branches: - # only: vNext - # - test_and_report: - # requires: - # - checkout_code - # - build: - # requires: - # - checkout_code - # - deployment: - # requires: - # - checkout_code - # - test_and_report - # - build - ### # MERGE: FEATURE/HOTFIX BRANCHES ### diff --git a/.circleci/version.sh b/.circleci/version.sh index b4d73ab1f..b44cea144 100644 --- a/.circleci/version.sh +++ b/.circleci/version.sh @@ -8,7 +8,7 @@ then | sed 's/[",]//g' \ | tr -d '[[:space:]]') - NEW_PACKAGE_VERSION=$(echo $PACKAGE_VERSION | sed -e "s/^\([0-9]*\.[0-9]*\.[0-9]*)/\build-$CIRCLE_BUILD_NUM/") + NEW_PACKAGE_VERSION=$(echo $PACKAGE_VERSION | sed -e "s/^\([0-9]*\.[0-9]*\.[0-9]*\)$/\build-$CIRCLE_BUILD_NUM/") echo "Found package version: $PACKAGE_VERSION" echo "Setting version to: $NEW_PACKAGE_VERSION" # uses npm-version to set version in package.json