search

GoogleCloudPlatform / prometheus-engine

Google Cloud Managed Service for Prometheus libraries and manifests.
https://g.co/cloud/managedprometheus
Apache License 2.0
195 stars 93 forks source link

chore: release from release branches #862

Closed bernot-dev closed 8 months ago

bernot-dev commented 8 months ago

In addition to releasing from main, release on release branches.

TheSpiritXIII commented 8 months ago

I released from the main branch before. It is frail because subsequent patches will need a release branch, but it makes life easier at the moment. Do we want maybe both or are we sure we want to lock it down to release branches?

bernot-dev commented 8 months ago

Yeah, maybe we should do both so the first tag of a release is an ancestor of main.

With releases from main:

  1. Merge release PR. First tag is on main history.
  2. Create release branch, with release commit at the root of the branch.
  3. Add additional commits to release branch, as necessary. Release again on branch.

With releases only from release/ branches:

  1. Create release branch from main.
  2. Merge release PR, release is not on main.
  3. Add additional commits to release branch, as necessary. Release again on branch.

I'll make that change.