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-23.1: deps: update golang.org/x/tools #106533

Merged

Conversation

rickystewart
Copy link
Collaborator

Backport 1/1 commits from #106256.

/cc @cockroachdb/release


The patch updates golang.org/x/term from v0.6.0 to v0.7.0. The update is in part motivated by spurious nogo compilation errors tracked in #99988.

Informs: #99988

Release note: None
Epic: none
Release justification: fix spurious nogo errors in build

The patch updates golang.org/x/term from v0.6.0 to v0.7.0. The update is in
part motivated by spurious nogo compilation errors tracked in
cockroachdb#99988.

Informs cockroachdb#99988

Release note: None
@rickystewart rickystewart requested review from rail, knz and msbutler July 10, 2023 17:02
@rickystewart rickystewart requested a review from a team as a code owner July 10, 2023 17:02
@blathers-crl
Copy link

blathers-crl bot commented Jul 10, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@msbutler
Copy link
Collaborator

qq: is it necessary to re-./dev gen bazel --mirror on your 23.1 branch, even if it is a clean backport (which it seems to be)?

@rickystewart
Copy link
Collaborator Author

qq: is it necessary to re-./dev gen bazel --mirror on your 23.1 branch, even if it is a clean backport (which it seems to be)?

Unfortunately this was not really a clean backport (as there was a conflict) but it was quite close.

To answer the question, generally no. For example in this case only the backport (once the conflicts were resolved) was actually necessary. Out of an abundance of caution I re-ran dev gen bazel on the branch before submitting the PR but it had no effect.

Note that failing to dev gen bazel when you would have to will cause your PR to fail CI, so you can always just backport if you're okay with potentially wasting a little time and having to do an extra CI run in the case that dev gen bazel was necessary.

For (clean) backports, the extra --mirror argument is almost never required even if you do need dev gen bazel. (--mirror causes new vendored dependencies to be uploaded to GCS, but for a clean backport, the dependencies are already there in GCS.)

@msbutler
Copy link
Collaborator

Note that failing to dev gen bazel when you would have to will cause your PR to fail CI

good to know!

@rickystewart
Copy link
Collaborator Author

TFTRs!

@rickystewart rickystewart merged commit b89808d into cockroachdb:release-23.1 Jul 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants