[flutter_conductor] fix auto-tagging branch point#98618
[flutter_conductor] fix auto-tagging branch point#98618fluttergithubbot merged 6 commits intoflutter:masterfrom
Conversation
flutter-dashboard
bot
added
the
c: contributor-productivity
christopherfujino
force-pushed
the
conductor-fix-branch-point-better
branch
from
c887a32 to
0ca30cc
Compare
|
friendly ping @itsjustkevin & @godofredoc |
| return requestedVersion; | ||
| } | ||
| assert( | ||
| requestedVersion.n == 0, |
There was a problem hiding this comment.
Will this only apply to betas?
There was a problem hiding this comment.
If we hit this point during a stable release, it's too late to auto-tag the branch point, because we've already done beta releases, in which case it makes sense for the assert to fail and to proceed we'll have to just override this check.
As another point, right now this check is overridden by the --force flag. However, per Kevin, we're already having to use that flag each time because the branch names do not match the release versions. I'm guessing I should make separate override flags for each check?
There was a problem hiding this comment.
Yeah, hopefully we don't get behind on creating the new beta branches anymore to not have to use force anymore.
There was a problem hiding this comment.
In thinking more about this, I think rather than an assert and fail, I will just print a warning to STDERR that we're skipping this and exit the function.
3 participants
Fixes #92809
When I initially implemented the
ensureBranchPointTagged()method, I had it early exit unless the increment wasm.This PR removes that check, and instead explicitly checks the branch point for a release tag. If it already has one, it exits early. In addition, there is an assert that verifies the
nvalue of the next version is 0 (if it's not 0, then we are in a bad state and likely cannot recover).In addition, this PR overrides the branch point check if
--forcewas provided.