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

Upgrade externals to latest releases (Feb 2022) #16484

Merged
merged 9 commits into from
Feb 2, 2022

Conversation

BetsyMcPhail
Copy link
Contributor

@BetsyMcPhail BetsyMcPhail commented Feb 1, 2022

Working towards #16481

The changes to scs are from the PR Under the hood API refactoring. Specifically, see glbopts.h


This change is Reviewable

@BetsyMcPhail BetsyMcPhail added the status: commits are properly curated https://drake.mit.edu/reviewable.html#curated-commits label Feb 1, 2022
@BetsyMcPhail BetsyMcPhail force-pushed the upgrades branch 2 times, most recently from 7778295 to 0ed0e08 Compare February 2, 2022 01:32
@jwnimmer-tri
Copy link
Collaborator

Looks like uWebsockets started using std::from_chars from <charconv> to parse Apple user-agents (uNetworking/uWebSockets@89ea606), but our GCC 7 on Ubuntu 18 doesn't offer that header.

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.

Is this ready for feature review?

Reviewable status: needs platform reviewer assigned, needs at least two assigned reviewers, when planning a "properly curated" merge commit the PR must always be rebased onto latest master, missing label for release notes

Copy link
Contributor Author

@BetsyMcPhail BetsyMcPhail left a comment

Choose a reason for hiding this comment

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

CI is happy so we're ready for review. +@jwnimmer-tri for feature review please

Reviewable status: LGTM missing from assignee jwnimmer-tri(platform), needs at least two assigned reviewers, when planning a "properly curated" merge commit the PR must always be rebased onto latest master, missing label for release notes (waiting on @jwnimmer-tri)

@jwnimmer-tri jwnimmer-tri added the status: single reviewer ok https://drake.mit.edu/reviewable.html label Feb 2, 2022
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.

+(status: single reviewer ok) LGTM so far.

Once the next change is pushed, please also launch a macOS CI build. Then we should be OK to merge.

Reviewed 1 of 1 files at r1, 1 of 1 files at r2, 1 of 1 files at r3, 2 of 2 files at r4, 2 of 2 files at r5, 1 of 1 files at r6, 1 of 1 files at r7, 1 of 1 files at r8, 1 of 1 files at r9, all commit messages.
Reviewable status: 1 unresolved discussion, LGTM missing from assignee jwnimmer-tri(platform), when planning a "properly curated" merge commit the PR must always be rebased onto latest master, missing label for release notes (waiting on @BetsyMcPhail)


solvers/scs_solver.cc, line 729 at r9 (raw file):

  // their instantiated members) upon return from the DoSolve function.
  ScopeExit scs_free_guard([&cone, &scs_problem_data, &scs_stgs]() {
    _scs_free_data(scs_problem_data, cone, scs_stgs);

These changes are curated into the Xacro commit. They should be part of the SCS commit, instead.

@BetsyMcPhail
Copy link
Contributor Author

@drake-jenkins-bot mac-monterey-clang-bazel-experimental-release please
@drake-jenkins-bot mac-big-sur-clang-bazel-experimental-release please

Copy link
Contributor Author

@BetsyMcPhail BetsyMcPhail 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: 1 unresolved discussion, LGTM missing from assignee jwnimmer-tri(platform), missing label for release notes (waiting on @jwnimmer-tri)


solvers/scs_solver.cc, line 729 at r9 (raw file):

Previously, jwnimmer-tri (Jeremy Nimmer) wrote…

These changes are curated into the Xacro commit. They should be part of the SCS commit, instead.

Good catch - thanks

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 reviews.

Both macOS builds have passed, so the only thing remaining on this PR is to play the rebase game to reach the tip of master before merging.

Reviewed all commit messages.
Reviewable status: when planning a "properly curated" merge commit the PR must always be rebased onto latest master, missing label for release notes (waiting on @BetsyMcPhail)

@jwnimmer-tri jwnimmer-tri added the release notes: fix This pull request contains fixes (no new features) label Feb 2, 2022
Copy link
Contributor Author

@BetsyMcPhail BetsyMcPhail left a comment

Choose a reason for hiding this comment

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

Rebase is done... I don't have permissions to force merge without waiting for tests

Reviewable status: :shipit: complete! all discussions resolved, LGTM from assignee jwnimmer-tri(platform), base commit is latest master (waiting on @BetsyMcPhail)

@jwnimmer-tri
Copy link
Collaborator

I'll force the merge as soon as one of the bazel builds passes.

@jwnimmer-tri jwnimmer-tri merged commit 3016205 into RobotLocomotion:master Feb 2, 2022
@BetsyMcPhail BetsyMcPhail deleted the upgrades branch February 8, 2022 02:06
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.

None yet

3 participants