diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e883f2e6..58110d0f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -101,11 +101,13 @@ markdown-toc -i --maxdepth 3 --bullets='-' README.md ## Releases -1. Prepare the appropriate "stable" branch for release, eg. `10-stable` - 1. git checkout 10-stable - 1. Checkout a new branch, eg. `release-10.3.0` - 1. Merge the relevant changes from `master`. This could be a plain merge, or - it could be cherry-picking. The later is more common in backports. +The X-stable branches, e.g. 15-stable, are no longer maintained; not worth the +effort given that we only maintain the latest version. Ie. haven't done a +backport in a very long time. + +1. Prepare release PR + 1. Checkout a new branch, eg. `release-15.1.0` + 1. Merge the relevant changes from `master` 1. Set the version in `lib/paper_trail/version_number.rb` 1. In the changelog, - Replace "Unreleased" with the date in ISO-8601 format @@ -113,18 +115,13 @@ markdown-toc -i --maxdepth 3 --bullets='-' README.md 1. In the readme, update references to version number, including - list of documentation versions - compatability table, if necessary - 1. git commit -am 'Release 10.3.0' - 1. git push -u origin release-10.3.0 - 1. Pull request into `10-stable`, CI pass, merge PR + 1. git commit -am 'Release 15.1.0' + 1. git push -u origin release-15.1.0 + 1. Pull request into `master`, CI pass, merge PR 1. Release - 1. git checkout 10-stable && git pull 1. gem build paper_trail.gemspec - 1. gem push paper_trail-10.3.0.gem - 1. git tag -a -m "v10.3.0" "v10.3.0" # or whatever number + 1. gem push paper_trail-15.1.0.gem + 1. git tag -a -m "v15.1.0" "v15.1.0" # or whatever number 1. git push --tags origin -1. Cleanup - 1. git checkout master - 1. cherry-pick the "Release 10.3.0" commit from the `10-stable` branch - 1. git push origin master [1]: https://github.com/paper-trail-gem/paper_trail/blob/master/.github/ISSUE_TEMPLATE/bug-report.md diff --git a/CHANGELOG.md b/CHANGELOG.md index b546fa2f..f177347b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,20 @@ recommendations of [keepachangelog.com](http://keepachangelog.com/). - None +### Added + +- None + +### Fixed + +- None + +## 15.1.0 (2023-10-22) + +### Breaking Changes + +- None + ### Fixed - None diff --git a/README.md b/README.md index a0562d8b..00760fad 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ This is the _user guide_. See also, the Choose version: [Unreleased](https://github.com/paper-trail-gem/paper_trail/blob/master/README.md), -[15.0](https://github.com/paper-trail-gem/paper_trail/blob/v15.0.0/README.md), +[15.1](https://github.com/paper-trail-gem/paper_trail/blob/v15.1.0/README.md), [14.0](https://github.com/paper-trail-gem/paper_trail/blob/v14.0.0/README.md), [13.0](https://github.com/paper-trail-gem/paper_trail/blob/v13.0.0/README.md), [12.3](https://github.com/paper-trail-gem/paper_trail/blob/v12.3.0/README.md), @@ -90,24 +90,24 @@ Choose version: ### 1.a. Compatibility -| paper_trail | branch | ruby | activerecord | -|-------------|------------|----------|---------------| -| unreleased | master | >= 3.0.0 | >= 6.1, < 7.2 | -| 15 | 15-stable | >= 3.0.0 | >= 6.1, < 7.1 | -| 14 | 14-stable | >= 2.7.0 | >= 6.0, < 7.1 | -| 13 | 13-stable | >= 2.6.0 | >= 5.2, < 7.1 | -| 12 | 12-stable | >= 2.6.0 | >= 5.2, < 7.1 | -| 11 | 11-stable | >= 2.4.0 | >= 5.2, < 6.1 | -| 10 | 10-stable | >= 2.3.0 | >= 4.2, < 6.1 | -| 9 | 9-stable | >= 2.3.0 | >= 4.2, < 5.3 | -| 8 | 8-stable | >= 2.2.0 | >= 4.2, < 5.2 | -| 7 | 7-stable | >= 2.1.0 | >= 4.0, < 5.2 | -| 6 | 6-stable | >= 1.9.3 | >= 4.0, < 5.2 | -| 5 | 5-stable | >= 1.9.3 | >= 3.0, < 5.1 | -| 4 | 4-stable | >= 1.8.7 | >= 3.0, < 5.1 | -| 3 | 3.0-stable | >= 1.8.7 | >= 3.0, < 5 | -| 2 | 2.7-stable | >= 1.8.7 | >= 3.0, < 4 | -| 1 | rails2 | >= 1.8.7 | >= 2.3, < 3 | +| paper_trail | ruby | activerecord | +|-------------|----------|---------------| +| unreleased | >= 3.0.0 | >= 6.1, < 7.2 | +| 15 | >= 3.0.0 | >= 6.1, < 7.2 | +| 14 | >= 2.7.0 | >= 6.0, < 7.1 | +| 13 | >= 2.6.0 | >= 5.2, < 7.1 | +| 12 | >= 2.6.0 | >= 5.2, < 7.1 | +| 11 | >= 2.4.0 | >= 5.2, < 6.1 | +| 10 | >= 2.3.0 | >= 4.2, < 6.1 | +| 9 | >= 2.3.0 | >= 4.2, < 5.3 | +| 8 | >= 2.2.0 | >= 4.2, < 5.2 | +| 7 | >= 2.1.0 | >= 4.0, < 5.2 | +| 6 | >= 1.9.3 | >= 4.0, < 5.2 | +| 5 | >= 1.9.3 | >= 3.0, < 5.1 | +| 4 | >= 1.8.7 | >= 3.0, < 5.1 | +| 3 | >= 1.8.7 | >= 3.0, < 5 | +| 2 | >= 1.8.7 | >= 3.0, < 4 | +| 1 | >= 1.8.7 | >= 2.3, < 3 | Experts: to install incompatible versions of activerecord, see `paper_trail/compatibility.rb`. diff --git a/lib/paper_trail/version_number.rb b/lib/paper_trail/version_number.rb index ebba0754..93719bf3 100644 --- a/lib/paper_trail/version_number.rb +++ b/lib/paper_trail/version_number.rb @@ -8,7 +8,7 @@ module PaperTrail # People are encouraged to use `PaperTrail.gem_version` instead. module VERSION MAJOR = 15 - MINOR = 0 + MINOR = 1 TINY = 0 # Set PRE to nil unless it's a pre-release (beta, rc, etc.)