-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Upgrade Externals January 2023 #18516
Upgrade Externals January 2023 #18516
Conversation
c1e7397
to
ca015ae
Compare
e666965
to
090a0a6
Compare
+@jwnimmer-tri for feature review, please. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
both reviews +(status: single reviewer ok).
+(release notes: fix) +(status: commits are properly curated)
Reviewed 1 of 1 files at r1, 3 of 3 files at r2, 1 of 1 files at r3, 1 of 1 files at r4, 1 of 1 files at r5, 1 of 1 files at r6, 2 of 2 files at r7, all commit messages.
Reviewable status: when planning a "properly curated" merge commit the PR must always be rebased onto latest master (waiting on @mwoehlke-kitware)
@drake-jenkins-bot mac-x86-monterey-clang-bazel-experimental-release please. The https://github.com/RobotLocomotion/drake/blob/master/tools/workspace/README.md#semi-automated-monthly-upgrades document says:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: 1 unresolved discussion, when planning a "properly curated" merge commit the PR must always be rebased onto latest master (waiting on @mwoehlke-kitware)
-- commits
line 2 at r7:
The README instructions say "add the commit using the instructions that were printed by new_release". The commit instructions printed by the tool do not include the git commit sha in the subject like (e.g., for abseil_cpp_internal
):
...
Done. Be sure to review and commit the changes:
git add tools/workspace/abseil_cpp_internal/repository.bzl
git commit -m'[workspace] Upgrade abseil_cpp_internal to latest commit'
Since we need to rebase this PR anyway prior to merge, during the rebase we might as well remove the commit sha's from the three subject lines where it crept in. That will save the release manager the effort of editing them out later on.
a4b2be0
to
5b8c843
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: 1 unresolved discussion (waiting on @jwnimmer-tri)
Previously, jwnimmer-tri (Jeremy Nimmer) wrote…
The README instructions say "add the commit using the instructions that were printed by new_release". The commit instructions printed by the tool do not include the git commit sha in the subject like (e.g., for
abseil_cpp_internal
):... Done. Be sure to review and commit the changes: git add tools/workspace/abseil_cpp_internal/repository.bzl git commit -m'[workspace] Upgrade abseil_cpp_internal to latest commit'Since we need to rebase this PR anyway prior to merge, during the rebase we might as well remove the commit sha's from the three subject lines where it crept in. That will save the release manager the effort of editing them out later on.
The README also gives an example of what to do, which includes the new "version". Maybe that example should either be more complete, or should not exist. (Although, as the script knows how to make the commit, why doesn't it just do so?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: 1 unresolved discussion (waiting on @mwoehlke-kitware)
Previously, mwoehlke-kitware (Matthew Woehlke) wrote…
The README also gives an example of what to do, which includes the new "version". Maybe that example should either be more complete, or should not exist. (Although, as the script knows how to make the commit, why doesn't it just do so?)
Per f2f: yup, a command-line option to run the git
commands on behalf of the user sounds find. That would reduce manual steps. (Users who are particular about how they invoke git could still commit manually.) In that case, the README could switch to use it, which would remove the misleading example commands.
This is just waiting on a rebase. Shall I push that on your behalf? |
Upgrade usockets to v0.8.5. Upgrade uwebsockets to v20.35.0. Due to interdependencies, these need to be upgraded together.
5b8c843
to
06f6671
Compare
Done. Didn't I already do that once, though? IIRC, usually someone with force-merge permission does the final rebase, because otherwise the rebase needs to be coordinated with said person actually doing the merge. (Or get lucky that CI completes without master changing out from under the PR.) |
Not since review was assigned, at least according to my interpretation of the github timeline.
That's probably a valid way to do it, but I don't know if we've ever done it that way. My advice is to do the rebase and then immediately ping one of the two super-admins (myself and Sherm) and we can override CI to merge immediately. |
(Rebased or not?) Huh. I could've sworn I rebased it when I removed the SHAs from the commit messages. Maybe I forgot to update my local master first. 😛 (Who rebases?) Hmm, I thought that was how it usually happened. Maybe I'm misremembering. 🤷 |
Previously, jwnimmer-tri (Jeremy Nimmer) wrote…
(This thread is resolved. Also, see #18548.) |
I wonder if GitHub has a "rebase this PR onto the tip of master" button on the web somewhere. That would probably be the easiest (especially if platform reviewers could just click it). |
Github has an option to rebase a PR. (I believe it doesn't create a merge commit, though, just adds the commits directly to master.) |
The upgrade in RobotLocomotion#18516 broke meshcat on Deepnote again. See RobotLocomotion#18289.
The upgrade in RobotLocomotion#18516 broke meshcat on Deepnote again. See RobotLocomotion#18289.
The upgrade in RobotLocomotion#18516 broke meshcat on Deepnote again. See RobotLocomotion#18289.
The upgrade in RobotLocomotion#18516 broke meshcat on Deepnote again. See RobotLocomotion#18289.
Towards #18510. Fixes #17910.
This change is