forked from mirror/client_golang
Merge pull request #1161 from prometheus/release-1.13
Merge release branch 1.13 to main
This commit is contained in:
commit
07d3a81494
|
@ -1,5 +1,11 @@
|
|||
## Unreleased
|
||||
|
||||
## 1.13.1 / 2022-11-01
|
||||
|
||||
* [BUGFIX] Fix race condition with Exemplar in Counter. #1146
|
||||
* [BUGFIX] Fix `CumulativeCount` value of `+Inf` bucket created from exemplar. #1148
|
||||
* [BUGFIX] Fix double-counting bug in `promhttp.InstrumentRoundTripperCounter`. #1118
|
||||
|
||||
## 1.13.0 / 2022-08-05
|
||||
|
||||
* [CHANGE] Minimum required Go version is now 1.17 (we also test client_golang against new 1.19 version).
|
||||
|
|
21
README.md
21
README.md
|
@ -69,3 +69,24 @@ See the [contributing guidelines](CONTRIBUTING.md) and the
|
|||
[Community section](http://prometheus.io/community/) of the homepage.
|
||||
|
||||
`clint_golang` community is also present on the CNCF Slack `#prometheus-client_golang`.
|
||||
|
||||
### For Maintainers: Release Process
|
||||
|
||||
To cut a minor version:
|
||||
|
||||
1. Create a new branch `release-<major>.<minor>` on top of the `main` commit you want to cut the version from and push it.
|
||||
2. Create a new branch on top of the release branch, e.g. `<yourname>/cut-<major>.<minor>.<patch>`,
|
||||
3. Change the `VERSION` file.
|
||||
4. Update `CHANGELOG` (only user-impacting changes to mention).
|
||||
5. Create PR, and get it reviewed.
|
||||
6. Once merged, create a release with the `release-<major>.<minor>` tag on GitHub with the `<version> / <date>` title.
|
||||
7. Announce on the prometheus-announce mailing list, slack and Twitter.
|
||||
8. Merge the release branch back to the `main` using the "merge without squashing" approach (!).
|
||||
|
||||
> NOTE: In case of merge conflicts, you can checkout the release branch in a new branch, e.g. <yourname>/resolve-conflicts`, fix the merge problems there, and then do a PR into main from the new branch. In that way, you still get all the commits in the release branch back into `main`, but leave the release branch alone.
|
||||
|
||||
To cut the patch version:
|
||||
|
||||
1. Create a branch on top of the release branch you want to use.
|
||||
2. Cherry-pick the fixes from the `main` branch (or add new commits) to fix critical bugs for that patch release.
|
||||
3. Follow steps 3-8 as above.
|
||||
|
|
Loading…
Reference in New Issue