Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-tool] refactor update branch command and manager #9616

Merged
merged 2 commits into from
Dec 20, 2024

Conversation

radTuti
Copy link
Contributor

@radTuti radTuti commented Dec 18, 2024

Description

This update the branch subcommands and branch manager.

As an extension, version package is also updated to support EPs and allow avoiding conflicts in closed source.

Related issues/PRs

Todos

  • Tests
  • Documentation
  • Release note

Release Note

TBD

Reminder for the reviewer

Make sure that this PR has the correct labels and milestone set.

Every PR needs one docs-* label.

  • docs-pr-required: This change requires a change to the documentation that has not been completed yet.
  • docs-completed: This change has all necessary documentation completed.
  • docs-not-required: This change has no user-facing impact and requires no docs.

Every PR needs one release-note-* label.

  • release-note-required: This PR has user-facing changes. Most PRs should have this label.
  • release-note-not-required: This PR has no user-facing changes.

Other optional labels:

  • cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.
  • needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.

@radTuti radTuti added docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact labels Dec 18, 2024
@radTuti radTuti requested a review from a team as a code owner December 18, 2024 22:41
@marvin-tigera marvin-tigera added this to the Calico v3.30.0 milestone Dec 18, 2024
return re.MatchString(string(v))
}

// DetermineReleaseVersion uses historical clues to figure out the next semver
// release number to use for this release based on the current git revision.
//
// OSS Calico uses the following rules:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there is value in separating the version rules that OSS uses vs enterprise?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the moment, the way the rules are structured apply with OSS and Enterprise although Enterprise is only the first scenario since it creates a new dev tag after every release.

@caseydavenport caseydavenport merged commit 625daf0 into projectcalico:master Dec 20, 2024
3 checks passed
@radTuti radTuti deleted the reltool-branch branch December 20, 2024 16:27
radTuti added a commit to radTuti/calico that referenced this pull request Dec 20, 2024
…ico#9616)

* update branching and versioning

* address review feedback
radTuti added a commit to radTuti/calico that referenced this pull request Dec 31, 2024
…ico#9616)

* update branching and versioning

* address review feedback
radTuti added a commit to radTuti/calico that referenced this pull request Jan 3, 2025
…ico#9616)

* update branching and versioning

* address review feedback
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants