-
Notifications
You must be signed in to change notification settings - Fork 10
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
Merge upstream/master
(35045ee) from previous merge-base (f2bd883)
#29
Conversation
* 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
…ure/merge_20190508
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.
+@m-chaturvedi for review, please.
Reviewable status: 0 of 12 files reviewed, all discussions resolved (waiting on @m-chaturvedi)
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: 0 of 12 files reviewed, all discussions resolved (waiting on @m-chaturvedi)
Hm... Breathe seems to be struggling on CI. Will disable it for now. |
Primarily for CI fixes
Process:
Submit PR to Drake using this branch. Ensure experimental CI passesWill be handled by cast: Ensure that pointers do not use rvalue / move overload #28drake
intono_prune
withmerge --no-ff --strategy=ours
last_sha_of_previous_fork
to olddrake
, force pushupstream
, push without--force
This change is