auto icon indicating copy to clipboard operation
auto copied to clipboard

[question]: Best practices for synchronizing versions in a two-branch prerelease workflow

Open hydrosquall opened this issue 4 years ago • 0 comments

Describe the bug

The documentation for auto shipit recommends

To update the latest stable version simply merge your pre-release branch into your baseBranch.

A downside to this approach is that your long-lived prerelease will not have its version bumped, so it is now behind the stable branch.

(For example: This commit was created on stable)

  • https://github.com/vega/vega-tooltip/commit/8ca292963c22ebc8699490313f11c05cdd7eb6d7

However, it was not applied to our long-lived pre-release branch, next, so our pre-release branch is now behind.

  • https://github.com/vega/vega-tooltip/blob/b815153965f6f23d0240c99abf18ee86cbdc81e6/package.json#L3

Which would be the recommended way to keep a perpetual "prerelease" branches in sync with stable?

  1. Manually create an additional PR after merging next -> stable to synchronize the versions in both places
  2. Any time after next -> stable is merged, manually reset next to the head of stable
  3. Come up with some sort of custom plugin to synchronize the branches automatically

hydrosquall avatar Aug 03 '21 19:08 hydrosquall