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

sync up with rootmaster branch #5617

Merged
merged 1 commit into from
Mar 2, 2020

Conversation

davidlange6
Copy link
Contributor

we no longer need the CXX modules specific patches in root, so we can use the same branch/commit of root in the modules branch as in the root master branch. At the same time I've cleaned up some unnecessary differences between these branches in root.spec.

We can use this for the next modules IB (Monday night I think) - I've tested it via a full build locally.

@vgvassilev @mrodozov @oshadura @smuzaffar

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 2, 2020

A new Pull Request was created by @davidlange6 (David Lange) for branch IB/CMSSW_11_1_X/rootmodule.

@cmsbuild, @smuzaffar, @mrodozov, @tulamor can you please review it and eventually sign? Thanks.
cms-bot commands are listed here

@mrodozov
Copy link
Contributor

mrodozov commented Mar 2, 2020

so we wait for the IB to build, since it has to pick the latest changes for DD4hep fix, and when it's built we test this against it. In short - tomorrow morning ?
Or merge it since it builds, so the IB will include it ?

@davidlange6
Copy link
Contributor Author

davidlange6 commented Mar 2, 2020 via email

@mrodozov
Copy link
Contributor

mrodozov commented Mar 2, 2020

+externals

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 2, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/4952/console Started: 2020/03/02 14:12

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 2, 2020

This pull request is fully signed and it will be integrated in one of the next IB/CMSSW_11_1_X/rootmodule IBs after it passes the integration tests. This pull request will now be reviewed by the release team before it's merged. @davidlange6, @silviodonato, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

@mrodozov
Copy link
Contributor

mrodozov commented Mar 2, 2020

abort
@silviodonato if we test this it will fail because the last modules IB doesn't include a change for DD4Hep, so no point of testing it. The code includes it now (both cmssw and cmsdist) but the IB did not have one part (the cmsdist one)

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 2, 2020

Jenkins tests are aborted.

@mrodozov mrodozov merged commit 2df4082 into cms-sw:IB/CMSSW_11_1_X/rootmodule Mar 2, 2020
@mrodozov
Copy link
Contributor

mrodozov commented Mar 2, 2020

get this in the next modules IB

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants