Skip to content

Upgrade Externals May 2025 #22964

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

Merged

Conversation

Aiden2244
Copy link
Contributor

@Aiden2244 Aiden2244 commented May 2, 2025

Towards #22928

The bulk of May external upgrades, minus the Bazel upgrade (see #22929) and the venv upgrade (coming soon).


This change is Reviewable

@Aiden2244 Aiden2244 mentioned this pull request May 2, 2025
8 tasks
@Aiden2244 Aiden2244 force-pushed the 22928/upgrade-externals-may branch 4 times, most recently from 5192c46 to 76efaf6 Compare May 5, 2025 15:56
@Aiden2244 Aiden2244 force-pushed the 22928/upgrade-externals-may branch 3 times, most recently from 8588689 to 6f700c7 Compare May 6, 2025 21:19
@jwnimmer-tri

This comment was marked as resolved.

@jwnimmer-tri
Copy link
Collaborator

@drake-jenkins-bot linux-jammy-clang-bazel-experimental-everything-release please

Flake #20344.

Copy link
Member

@sherm1 sherm1 left a comment

Choose a reason for hiding this comment

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

+@jwnimmer-tri for feature review or delegation, please

Reviewable status: LGTM missing from assignee jwnimmer-tri(platform), needs at least two assigned reviewers, commits need curation (https://drake.mit.edu/reviewable.html#curated-commits), missing label for release notes (waiting on @Aiden2244)

@jwnimmer-tri jwnimmer-tri added status: commits are properly curated https://drake.mit.edu/reviewable.html#curated-commits release notes: fix This pull request contains fixes (no new features) status: single reviewer ok https://drake.mit.edu/reviewable.html labels May 8, 2025
Copy link
Collaborator

@jwnimmer-tri jwnimmer-tri left a comment

Choose a reason for hiding this comment

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

:lgtm: both +(status: single reviewer ok) pending discussions below. (When making the fixes, be sure to amend the correct commit.)

Reviewed 37 of 37 files at r1, all commit messages.
Reviewable status: 3 unresolved discussions, when planning a "properly curated" merge commit the PR must always be rebased onto latest master (waiting on @Aiden2244)


-- commits line 27 at r1:
nit This abseil commit title should say "... to latest commit". Somehow the last word got lost.


tools/workspace/abseil_cpp_internal/patches/inline_namespace.patch line 14 at r1 (raw file):

 // be changed to a new, unique identifier name.  In particular "head" is not
 // allowed.

nit Here and a few more times within this patch file, do not remove the single-space blank lines. They are an integral part of a patch file. (In general, don't "remove trailing whitespace" in your editor when editing patch files.)


tools/workspace/crate_universe/lock/details/defs.bzl.orig line 0 at r1 (raw file):
Don't commit this file.

@Aiden2244 Aiden2244 force-pushed the 22928/upgrade-externals-may branch from ffc901c to f5e73dc Compare May 9, 2025 15:12
Copy link
Contributor Author

@Aiden2244 Aiden2244 left a comment

Choose a reason for hiding this comment

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

Reviewable status: 2 unresolved discussions, when planning a "properly curated" merge commit the PR must always be rebased onto latest master (waiting on @Aiden2244)


tools/workspace/abseil_cpp_internal/patches/inline_namespace.patch line 14 at r1 (raw file):

Previously, jwnimmer-tri (Jeremy Nimmer) wrote…

nit Here and a few more times within this patch file, do not remove the single-space blank lines. They are an integral part of a patch file. (In general, don't "remove trailing whitespace" in your editor when editing patch files.)

My editor would remove trailing whitespace with every save... it should be ok now.


tools/workspace/crate_universe/lock/details/defs.bzl.orig line at r1 (raw file):

Previously, jwnimmer-tri (Jeremy Nimmer) wrote…

Don't commit this file.

Done.

Copy link
Collaborator

@jwnimmer-tri jwnimmer-tri left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 2 files at r2, all commit messages.
Reviewable status: when planning a "properly curated" merge commit the PR must always be rebased onto latest master (waiting on @Aiden2244)

@jwnimmer-tri
Copy link
Collaborator

BTW also needs a rebase before we can merge.

@Aiden2244 Aiden2244 force-pushed the 22928/upgrade-externals-may branch from f5e73dc to 09ea1d7 Compare May 9, 2025 15:39
Copy link
Contributor Author

@Aiden2244 Aiden2244 left a comment

Choose a reason for hiding this comment

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

Done!

Reviewable status: when planning a "properly curated" merge commit the PR must always be rebased onto latest master (waiting on @Aiden2244)

@jwnimmer-tri
Copy link
Collaborator

The master you used for rebase was 1 commit stale. Needs another.

@Aiden2244 Aiden2244 force-pushed the 22928/upgrade-externals-may branch from 09ea1d7 to 9e8e549 Compare May 9, 2025 15:45
@jwnimmer-tri jwnimmer-tri merged commit 68d439f into RobotLocomotion:master May 9, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release notes: fix This pull request contains fixes (no new features) status: commits are properly curated https://drake.mit.edu/reviewable.html#curated-commits status: single reviewer ok https://drake.mit.edu/reviewable.html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants