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

Use the source version of drake's install_prereqs for external examples #313

Merged

Conversation

BetsyMcPhail
Copy link
Contributor

@BetsyMcPhail BetsyMcPhail commented Sep 20, 2024

Towards #61

This change is Reviewable

@BetsyMcPhail BetsyMcPhail force-pushed the split-up-jenkinsfile branch 5 times, most recently from 26ed3a0 to 74c8fce Compare September 27, 2024 20:59
@BetsyMcPhail BetsyMcPhail changed the title WIP: Jenkins refactor Use the source version of drake's install_prereqs for external examples Nov 13, 2024
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.

+@nicolecheetham for review

Reviewable status: all discussions resolved, LGTM missing from assignee nicolecheetham, platform LGTM missing (waiting on @nicolecheetham)

Copy link
Collaborator

@nicolecheetham nicolecheetham left a comment

Choose a reason for hiding this comment

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

The Jenkins job can't find the ubuntu install_prereqs file. Everything else looks good

Reviewable status: all discussions resolved, LGTM missing from assignee nicolecheetham, platform LGTM missing

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.

Something must have been lost in the rebase! I will fix it.

Reviewable status: all discussions resolved, LGTM missing from assignee nicolecheetham, platform LGTM missing (waiting on @nicolecheetham)

@BetsyMcPhail BetsyMcPhail force-pushed the split-up-jenkinsfile branch 10 times, most recently from f4555d7 to a320c09 Compare November 14, 2024 21:00
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.

@nicolecheetham this is ready for another look. I used the relevant changes from your PR #333.

Reviewable status: 1 unresolved discussion, LGTM missing from assignee nicolecheetham, platform LGTM missing (waiting on @nicolecheetham)


drake_bazel_external/.github/setup line 9 at r3 (raw file):

sudo ./.github/ubuntu_setup

# Download the drake source

Some background, in both the CMake and Bazel cases, the following needs to happen for setup:

  1. CI-only setup as sudo (.github/ubuntu_setup)
  2. Get drake source NOT as sudo, in a location that can written to as the normal user AND, for the bazel example, NOT in a subdirectory to the current example (e.g. drake_bazel_external/<not here>)
  3. Run the install script from 2 as sudo

I've removed setup/install_prereqs script, placed the code here and copied it in the READMEs. To avoid duplication, I could move this chunk of code to setup/install_prereqs, but I'm not sure where the best place to install drake source?

Copy link
Collaborator

@nicolecheetham nicolecheetham 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 nicolecheetham, platform LGTM missing (waiting on @BetsyMcPhail)


drake_bazel_external/.github/setup line 9 at r3 (raw file):

Previously, BetsyMcPhail (Betsy McPhail) wrote…

Some background, in both the CMake and Bazel cases, the following needs to happen for setup:

  1. CI-only setup as sudo (.github/ubuntu_setup)
  2. Get drake source NOT as sudo, in a location that can written to as the normal user AND, for the bazel example, NOT in a subdirectory to the current example (e.g. drake_bazel_external/<not here>)
  3. Run the install script from 2 as sudo

I've removed setup/install_prereqs script, placed the code here and copied it in the READMEs. To avoid duplication, I could move this chunk of code to setup/install_prereqs, but I'm not sure where the best place to install drake source?

I agree with moving the download and installation to setup/install_prereqs. It would also keep the README instructions simple. And if installing the drake source can't be done in a subdirectory why don't you tell people to put it right next to the specific example directory? This way it will be close by.

@BetsyMcPhail BetsyMcPhail force-pushed the split-up-jenkinsfile branch 2 times, most recently from e880da1 to 91b1e27 Compare November 24, 2024 16:08
Previously, the binary version of the script was called in addition to
replicating much of the source version. With this change, the
copy-and-paste is removed.
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.

@nicolecheetham this is ready for another look please

Reviewable status: 1 unresolved discussion, LGTM missing from assignee nicolecheetham, platform LGTM missing (waiting on @nicolecheetham)

Copy link
Collaborator

@nicolecheetham nicolecheetham left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: 1 unresolved discussion, platform LGTM missing (waiting on @BetsyMcPhail)

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.

+@xuchenhan-tri for platform review please. Note that the Mac failure is a known CI issue and that neither of the examples updated here are tested on Mac.

Reviewable status: all discussions resolved, LGTM missing from assignee xuchenhan-tri, platform LGTM missing (waiting on @nicolecheetham and @xuchenhan-tri)

Copy link

@xuchenhan-tri xuchenhan-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: nice!

Reviewed 6 of 15 files at r2, 1 of 13 files at r3, 13 of 13 files at r4, all commit messages.
Reviewable status: :shipit: complete! all discussions resolved, platform LGTM from [xuchenhan-tri] (waiting on @BetsyMcPhail)

@BetsyMcPhail BetsyMcPhail merged commit 4777e4b into RobotLocomotion:main Nov 25, 2024
8 of 9 checks passed
@BetsyMcPhail BetsyMcPhail deleted the split-up-jenkinsfile branch November 25, 2024 20:24
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.

3 participants