Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidying up comments and formatting #820

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 6 additions & 23 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
###
Expand Down
2 changes: 1 addition & 1 deletion .circleci/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down