Skip to content

Commit

Permalink
Merge pull request #343 from Kashoo/341-prep-release-2.7.1
Browse files Browse the repository at this point in the history
Issue 341: Prepare release of v2.7.1
  • Loading branch information
ziemek authored Feb 9, 2019
2 parents d0812f0 + f598c34 commit 325189c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Change Log
This project adheres to [Semantic Versioning](http://semver.org/). All notable changes will be documented in this file.

## [Unreleased]
## [2.7.1] - 2019-02-11
### Fixed
- [#338](https://github.com/Kashoo/synctos/issues/338): The `mustNotBeMissing` and `mustNotBeNull` constraints do not behave as expected

Expand Down Expand Up @@ -228,7 +228,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). All notable c
## [1.0.0] - 2016-07-12
First public release

[Unreleased]: https://github.com/Kashoo/synctos/compare/v2.7.0...HEAD
[Unreleased]: https://github.com/Kashoo/synctos/compare/v2.7.1...HEAD
[2.7.1]: https://github.com/Kashoo/synctos/compare/v2.7.0...v2.7.1
[2.7.0]: https://github.com/Kashoo/synctos/compare/v2.6.0...v2.7.0
[2.6.0]: https://github.com/Kashoo/synctos/compare/v2.5.0...v2.6.0
[2.5.0]: https://github.com/Kashoo/synctos/compare/v2.4.0...v2.5.0
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ When it is time to publish a new release, a project maintainer should follow the
2. Create a release branch (e.g. `v2.2.1-release`)
3. Create a GitHub release candidate tag (e.g. `v2.2.1-rc.1`) from the HEAD of the release branch; include the version's changelog content in the description and mark it as a "pre-release"
4. Validate the release candidate with [kashoo-document-definitions](https://github.com/Kashoo/kashoo-document-definitions), for example, by changing the package's "synctos" dependency version to target the release candidate tag (e.g. "[email protected]:Kashoo/synctos.git#v2.2.1-rc.1") and then running `npm install && npm test`. Confirm that a generated sync function also works with live instances of both Sync Gateway 1.x and 2.x.
5. Create a new branch (e.g. `issue-272-release-2.2.1`) based off of the _release_ branch, rather than the master branch:
5. Create a new branch (e.g. `272-prep-release-2.2.1`) based off of the _release_ branch, rather than the master branch:
1. Modify the "Unreleased" section of `CHANGELOG.md` to display the new version number and date stamp. Be sure to also create a new range comparison link for the new version (e.g. `[2.2.1]: https://github.com/Kashoo/synctos/compare/v2.2.0...v2.2.1`) and update the range comparison link for the "Unreleased" section (e.g. `[Unreleased]: https://github.com/Kashoo/synctos/compare/v2.2.1...HEAD`) at the bottom of the file.
2. Update the "version" property in `package.json` and then regenerate the package lock file using `npm install`
3. Upgrade the project's npm development dependencies (i.e. the "devDependencies" property in `package.json`) as necessary
4. Create a pull request that targets the _release_ branch, rather than the master branch (e.g. https://github.com/Kashoo/synctos/pull/273)
6. After the pull request is reviewed and merged, create a GitHub release tag (e.g. `v2.2.1`) from the HEAD of the release branch; include the version's changelog content in the description
7. Publish the new version to npm: `git checkout <release_branch_name> && git reset --hard && git pull && npm publish`
8. Create a new branch (e.g. `issue-272-post-2.2.1-release`) based off of the release branch, rather than the master branch
8. Create a new branch (e.g. `272-post-release-2.2.1`) based off of the release branch, rather than the master branch
1. Restore the "Unreleased" section to `CHANGELOG.md` in the master branch. Ensure that the range comparison link at the bottom of the file for the "Unreleased" section is accurate (e.g. `[Unreleased]: https://github.com/Kashoo/synctos/compare/v2.2.1...HEAD`).
2. Upgrade the project's runtime dependencies (i.e. the contents of the `lib` directory) as necessary
3. Create a pull request that targets the _release_ branch, rather than the master branch (e.g. https://github.com/Kashoo/synctos/pull/309)
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "synctos",
"version": "2.7.0",
"version": "2.7.1",
"description": "The Syncmaker. A tool to build comprehensive sync functions for Couchbase Sync Gateway.",
"keywords": [
"couchbase",
Expand Down

0 comments on commit 325189c

Please sign in to comment.