Skip to content

Merge upstream/master (35045ee) from previous merge-base (f2bd883) #29

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

Conversation

EricCousineau-TRI
Copy link
Collaborator

@EricCousineau-TRI EricCousineau-TRI commented May 8, 2019

Primarily for CI fixes

Process:

  • Submit PR to Drake using this branch. Ensure experimental CI passes Will be handled by cast: Ensure that pointers do not use rvalue / move overload #28
  • Review this PR.
  • Merge old drake into no_prune with merge --no-ff --strategy=ours
  • Reset last_sha_of_previous_fork to old drake, force push
  • Reset upstream, push without --force

This change is Reviewable

Guilhem Saurel and others added 10 commits February 4, 2019 16:09
* Fix warning that not including a cmake source or build dir will be a fatal error (it is now on newest CMakes)
    * Fixes appveyor
* Travis uses CMake 3.9 for more than a year now
* Travis dropped sudo: false in December
* Dropping Sphinx 2
- clang7: Suppress self-assign warnings; fix missing virtual dtors
- pypy:
  - Keep old version (newer stuff breaks)
  - Pin packages to extra index for speed
- travis:
  - Make docker explicit; remove docker if not needed
  - Make commands more verbose (for debugging / repro)
  - Make Ubuntu dist explicit per job
- Fix Windows
- Add names to travis
Copy link
Collaborator Author

@EricCousineau-TRI EricCousineau-TRI left a comment

Choose a reason for hiding this comment

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

+@m-chaturvedi for review, please.

Reviewable status: 0 of 12 files reviewed, all discussions resolved (waiting on @m-chaturvedi)

@m-chaturvedi
Copy link

:lgtm:

Copy link

@m-chaturvedi m-chaturvedi 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: 0 of 12 files reviewed, all discussions resolved (waiting on @m-chaturvedi)

@EricCousineau-TRI
Copy link
Collaborator Author

Hm... Breathe seems to be struggling on CI. Will disable it for now.

@EricCousineau-TRI EricCousineau-TRI merged commit e4e3745 into RobotLocomotion:drake May 8, 2019
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.

5 participants