Merge pull request #1161 from prometheus/release-1.13 · prometheus/client_golang@07d3a81 (original) (raw)

`@@ -69,3 +69,24 @@ See the contributing guidelines and the

`

69

69

`Community section of the homepage.

`

70

70

``

71

71

`` clint_golang community is also present on the CNCF Slack #prometheus-client_golang.

``

``

72

+

``

73

`+

For Maintainers: Release Process

`

``

74

+

``

75

`+

To cut a minor version:

`

``

76

+

``

77

`` +

  1. Create a new branch release-<major>.<minor> on top of the main commit you want to cut the version from and push it.

``

``

78

`` +

  1. Create a new branch on top of the release branch, e.g. <yourname>/cut-<major>.<minor>.<patch>,

``

``

79

`` +

  1. Change the VERSION file.

``

``

80

`` +

  1. Update CHANGELOG (only user-impacting changes to mention).

``

``

81

`+

  1. Create PR, and get it reviewed.

`

``

82

`` +

  1. Once merged, create a release with the release-<major>.<minor> tag on GitHub with the <version> / <date> title.

``

``

83

`+

  1. Announce on the prometheus-announce mailing list, slack and Twitter.

`

``

84

`` +

  1. Merge the release branch back to the main using the "merge without squashing" approach (!).

``

``

85

+

``

86

`` +

NOTE: In case of merge conflicts, you can checkout the release branch in a new branch, e.g. /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.

``

``

87

+

``

88

`+

To cut the patch version:

`

``

89

+

``

90

`+

  1. Create a branch on top of the release branch you want to use.

`

``

91

`` +

  1. Cherry-pick the fixes from the main branch (or add new commits) to fix critical bugs for that patch release.

``

``

92

`+

  1. Follow steps 3-8 as above.

`