Skip to content

Conversation

@linev
Copy link
Member

@linev linev commented May 5, 2020

Extraction from #5535 to resolve conflicts in roofit

@linev linev requested a review from hageboeck May 5, 2020 10:35
@linev linev requested a review from lmoneta as a code owner May 5, 2020 10:35
@linev linev self-assigned this May 5, 2020
@phsft-bot
Copy link

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos7-multicore/default, ROOT-fedora29/python3, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1015/cxx17, windows10/cxx14
How to customize builds

@linev
Copy link
Member Author

linev commented May 5, 2020

@hageboeck Can you approve check this PR?
Without it I cannot update #5535 - changes in core classes have side effects in roofit, which are fixed here

@hageboeck
Copy link
Member

Hi,

sorry, cannot approve. I'm removing almost all uses of RooCatType in #5514
If I approve this now, I cannot merge that. I can try to rebase your commit on top of #5514 and then remove all merge conflicts. Would that be an option?

@linev
Copy link
Member Author

linev commented May 5, 2020

@hageboeck
It is up to you now. I extract changes in roofit in separate PR.
But would be nice to merge changes together soon, otherwise dev builds after #5535 will be corrupted

@hageboeck
Copy link
Member

Ok, so I'll take the commit and rebase it.

@linev
Copy link
Member Author

linev commented May 5, 2020

Close in favor of #5542

@linev linev closed this May 5, 2020
@linev linev deleted the roofit_includes branch May 5, 2020 12:56
@phsft-bot
Copy link

Build failed on ROOT-debian10-i386/cxx14.
Running on pcepsft10.dyndns.cern.ch:/build/workspace/root-pullrequests-build
See cdash.
See console output.

Errors:

  • [2020-05-05T13:29:53.635Z] CMake Error at /home/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:914 (message):

@phsft-bot
Copy link

Build failed on ROOT-fedora29/python3.
Running on root-fedora29-3.cern.ch:/build/workspace/root-pullrequests-build
See cdash.
See console output.

Errors:

  • [2020-05-05T14:59:57.030Z] CMake Error at /mnt/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:914 (message):

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