Skip to content

Conversation

@hageboeck
Copy link
Member

@hageboeck hageboeck commented May 5, 2020

Amended to not revert the changes to be added in PR #5514.

This should replace #5540

@hageboeck hageboeck requested a review from linev May 5, 2020 12:42
@hageboeck hageboeck requested a review from lmoneta as a code owner May 5, 2020 12:42
@hageboeck hageboeck 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

Copy link
Member

@linev linev left a comment

Choose a reason for hiding this comment

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

Fine with me

Amended to not revert the changes to be added in PR root-project#5514.
@linev
Copy link
Member

linev commented May 5, 2020

@hageboeck You need rebase again :(

@hageboeck hageboeck force-pushed the linev/roofit_includes branch from af398b3 to 01fc5b0 Compare May 5, 2020 13:05
@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

@hageboeck
Copy link
Member Author

Yes, but it's only one conflict instead of >10. :-)

@linev linev merged commit 33b1f38 into root-project:master May 5, 2020
@hageboeck hageboeck deleted the linev/roofit_includes branch May 5, 2020 15:40
@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-05T16:17:58.862Z] 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-2.cern.ch:/build/workspace/root-pullrequests-build
See cdash.
See console output.

Errors:

  • [2020-05-05T16:24:13.207Z] 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