Merge upstream master into cmake-modernisation branch
There were a few textual and semantic conflicts. Most notably:
- ignored the changes from gaudi/Gaudi!1103 (merged) as it wasn't obvious how they translate to new cmake
- ignored the changes related to Python 3 builds (GitLab CI, support for
+py3
compiler suffix inBINARY_TAG
) - made sure
GAUDI_VERSION.h
can be included as with old cmake. - fixed a missing and some misplaced test executable declaration in
GaudiKernel/CMakeLists.txt
- added a script and a CI job to check for unused sources (the new cmake requires explicit listing of each compilation unit)
- fix lookup for executables ending with .exe in tests (before tests picked up wrong executables from LCG views)
Merge request reports
Activity
https://gitlab.cern.ch/lhcb/Gaudi/-/tree/cmake-modernisation is currently identical to https://gitlab.cern.ch/clemenci/Gaudi/-/tree/cmake-modernisation . This MR is supposed to merge all the recent developments from master and will hopefully get us working nightly slots again (together with changing the source branch in lhcb-core/LHCbNightlyConf!434 (merged)).
@sponce I'm not super familiar with CMake, so if you'd like to have another look that's appreciated. I rebased upgrade-hackathon-setup!39 (merged) and that seems to work as well. Now on to the dd4hep branch there...
added 1 commit
- bf6537bf - Add a script and CI job checking for unused sources
added lhcb-new-cmake label
- [2020-08-07 00:11] Validation started with lhcb-new-cmake#153
- [2020-08-08 00:11] Validation started with lhcb-new-cmake#154
Edited by Software for LHCb- Resolved by Rosen Matev
Sorry I'm a bit lost here. Why do you "Merge upstream master into cmake-modernisation branch" ? I would rather rebase cmake-modernisation onto upstream master. Wouldn't that be more logical ?
https://lhcb-nightlies.web.cern.ch/nightly/lhcb-new-cmake/build/153/ looks much better than yesterday, and I'd say we can either merge this straight away or give it a go in
lhcb-gaussion
andlhcb-dd4hep
(by labeling wiht all-slots )no :( I mentioned them in the description. I'm tempted to merge manually or disable this feature (I don't have the karma, but it's at https://gitlab.cern.ch/lhcb/Gaudi/edit, under "Merge requests").
I restarted the pipeline on the
cmake-modernisation
branch to see if there all is green, let's seeThe problem is indeed new as the old pipeline didn't have it: https://gitlab.cern.ch/lhcb/Gaudi/-/pipelines/1850180 I'll investigate
I fixed that with c1ea57b7 and after a few job restarts (due to some weird non-reproducible errors
error while loading shared libraries ... file too short
) the pipeline is now green.
mentioned in commit 829a1a41