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.

Sign up for GitHub

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

Jump to bottom

Fix the release logic #152

Merged
merged 4 commits into from
Feb 17, 2022
Merged

Fix the release logic #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5db56c3
Bump version: 1.5.2 → 1.6.0
rezabekf Feb 17, 2022
a42dae1
Fix release logic
rezabekf Feb 17, 2022
c1f1edf
Remove auto commit
rezabekf Feb 17, 2022
1d580db
Merge branch 'main' into rezabekf/patch-local-development
rezabekf Feb 17, 2022
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
2 changes: 1 addition & 1 deletion .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[bumpversion]
current_version = 1.6.0
commit = True
commit = False
tag = True
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ version: $(VENV_NAME)

release:
@TAG_VERSION=$(shell bumpversion --dry-run --list .bumpversion.cfg | grep current_version | sed s/'^.*='//); \
git push origin "v$${TAG_VERSION}"
git push origin "v$${TAG_VERSION}" && git push

# Cleanup VirtualEnv
clean:
Expand Down
8 changes: 4 additions & 4 deletions docs/LOCAL_DEVELOPMENT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ The `bump2version` tool is used to take care of versioning including committing

When ready to publish new release follow the steps below:
```shell
# checkout and update main branch
git checkout main && git pull

# checkout release branch
git checkout release

Expand All @@ -97,11 +100,8 @@ git merge main
# bump the version following semantic guide above part=patch|minor|major
make version part=patch

# push the new version tag
# push the new version tag to origin
make release

# push the changes to origin
git push
```

Finally, create new release on [cfn101-workshop](https://github.com/aws-samples/cfn101-workshop/releases) release page
Expand Down