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

Chore: Continuing to fix release script #32

Merged
merged 1 commit into from
Mar 29, 2017
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
5 changes: 2 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Change Log

## [Unreleased](https://github.com/box/box-content-preview/tree/HEAD)

[Full Changelog](https://github.com/box/box-content-preview/compare/v0.113.0...HEAD)
## [v0.114.0](https://github.com/box/box-content-preview/tree/v0.114.0) (2017-03-29)
[Full Changelog](https://github.com/box/box-content-preview/compare/v0.113.0...v0.114.0)

**Merged pull requests:**

Expand Down
12 changes: 6 additions & 6 deletions build/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ increment_version() {
echo "----------------------------------------------------"
echo "Bumping major version..."
echo "----------------------------------------------------"
npm version major
npm --no-git-tag-version version major
elif $minor_release; then
echo "----------------------------------------------------"
echo "Bumping minor version..."
echo "----------------------------------------------------"
npm version minor
npm --no-git-tag-version version minor
elif $patch_release; then
echo "----------------------------------------------------"
echo "Bumping patch version..."
echo "----------------------------------------------------"
npm version patch
npm --no-git-tag-version version patch
fi

# The current version being built
Expand All @@ -49,7 +49,7 @@ update_changelog() {
echo "Updating CHANGELOG.md"
echo "----------------------------------------------------"

if github_changelog_generator box/box-content-preview; then
if github_changelog_generator box/box-content-preview --future-release v$VERSION; then
echo "----------------------------------------------------"
echo "Updated CHANGELOG successfully"
echo "----------------------------------------------------"
Expand Down Expand Up @@ -79,10 +79,10 @@ update_readme() {

push_to_github() {
# Add new files
git commit -a --amend --no-verify --no-edit
git commit -am $VERSION

# Force update tag after updating files
git tag -f v$VERSION
git tag -a v$VERSION -m $VERSION

echo "----------------------------------------------------"
echo "Master version is now at" $VERSION
Expand Down