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

Transition from sigcpp-2 to sigcpp-3 #36343

Merged
merged 2 commits into from Dec 13, 2021
Merged

Transition from sigcpp-2 to sigcpp-3 #36343

merged 2 commits into from Dec 13, 2021

Conversation

smuzaffar
Copy link
Contributor

These changes are needed by sigc++ version 3

@smuzaffar
Copy link
Contributor Author

test parameters:

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 3, 2021

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36343/27101

ERROR: Build errors found during clang-tidy run.

/cvmfs/cms-ib.cern.ch/nweek-02709/slc7_amd64_gcc900/external/sigcpp/2.6.2-cms/include/sigc++-2.0/sigc++/signal.h:2635:20: note: in instantiation of template class 'sigc::internal::signal_emit0<void (bool), sigc::nil>' requested here
--
/cvmfs/cms-ib.cern.ch/nweek-02709/slc7_amd64_gcc900/external/sigcpp/2.6.2-cms/include/sigc++-2.0/sigc++/signal.h:666:10: error: function cannot return function type 'sigc::internal::signal_emit0<void (const TGWindow *), sigc::nil>::result_type' (aka 'void (const TGWindow *)') [clang-diagnostic-error]
  static result_type emit(signal_impl* impl)
         ^
/cvmfs/cms-ib.cern.ch/nweek-02709/slc7_amd64_gcc900/external/sigcpp/2.6.2-cms/include/sigc++-2.0/sigc++/signal.h:2635:20: note: in instantiation of template class 'sigc::internal::signal_emit0<void (const TGWindow *), sigc::nil>' requested here
--
/cvmfs/cms-ib.cern.ch/nweek-02709/slc7_amd64_gcc900/external/sigcpp/2.6.2-cms/include/sigc++-2.0/sigc++/signal.h:666:10: error: function cannot return function type 'sigc::internal::signal_emit0<void (int, int), sigc::nil>::result_type' (aka 'void (int, int)') [clang-diagnostic-error]
  static result_type emit(signal_impl* impl)
         ^
/cvmfs/cms-ib.cern.ch/nweek-02709/slc7_amd64_gcc900/external/sigcpp/2.6.2-cms/include/sigc++-2.0/sigc++/signal.h:2635:20: note: in instantiation of template class 'sigc::internal::signal_emit0<void (int, int), sigc::nil>' requested here
--
/cvmfs/cms-ib.cern.ch/nweek-02709/slc7_amd64_gcc900/external/sigcpp/2.6.2-cms/include/sigc++-2.0/sigc++/signal.h:703:10: error: function cannot return function type 'sigc::internal::signal_emit0<void (), sigc::nil>::result_type' (aka 'void ()') [clang-diagnostic-error]
  static result_type emit_reverse(signal_impl* impl)
         ^
/cvmfs/cms-ib.cern.ch/nweek-02709/slc7_amd64_gcc900/external/sigcpp/2.6.2-cms/include/sigc++-2.0/sigc++/signal.h:703:10: error: function cannot return function type 'sigc::internal::signal_emit0<void (bool), sigc::nil>::result_type' (aka 'void (bool)') [clang-diagnostic-error]
/cvmfs/cms-ib.cern.ch/nweek-02709/slc7_amd64_gcc900/external/sigcpp/2.6.2-cms/include/sigc++-2.0/sigc++/signal.h:703:10: error: function cannot return function type 'sigc::internal::signal_emit0<void (const TGWindow *), sigc::nil>::result_type' (aka 'void (const TGWindow *)') [clang-diagnostic-error]
/cvmfs/cms-ib.cern.ch/nweek-02709/slc7_amd64_gcc900/external/sigcpp/2.6.2-cms/include/sigc++-2.0/sigc++/signal.h:703:10: error: function cannot return function type 'sigc::internal::signal_emit0<void (int, int), sigc::nil>::result_type' (aka 'void (int, int)') [clang-diagnostic-error]
Suppressed 2698 warnings (2697 in non-user code, 1 with check filters).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
Found compiler error(s).
--
gmake: *** [config/SCRAM/GMake/Makefile.coderules:129: code-checks] Error 2
gmake: *** [There are compilation/build errors. Please see the detail log above.] Error 2

@smuzaffar
Copy link
Contributor Author

code-checks with cms.week0.PR_cddbe267/52.0-a6892e1bac283099e8d8790601b27c6d

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 7, 2021

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36343/27180

  • This PR adds an extra 76KB to repository

Code check has found code style and quality issues which could be resolved by applying following patch(s)

@smuzaffar
Copy link
Contributor Author

@alja , can you please apply https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36343/27180/code-format.patch patch to your branch sigcpp3

@smuzaffar
Copy link
Contributor Author

@alja
Copy link
Contributor

alja commented Dec 10, 2021

@smuzaffar I applied the patch. I'm sorry I have missed the previous message 3 days ago.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36343/27304

  • This PR adds an extra 40KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @smuzaffar (Malik Shahzad Muzaffar) for master.

It involves the following packages:

  • Fireworks/Core (visualization)
  • Fireworks/Electrons (visualization)
  • Fireworks/ParticleFlow (visualization)
  • Fireworks/Tracks (visualization)

@cmsbuild, @makortel, @Dr15Jones, @alja can you please review it and eventually sign? Thanks.
@alja this is something you requested to watch as well.
@perrotta, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@smuzaffar
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4b8956/21196/summary.html
COMMIT: 0c90640
CMSSW: CMSSW_12_3_X_2021-12-10-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/36343/21196/install.sh to create a dev area with all the needed externals and cmssw changes.

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4b8956/21196/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4b8956/21196/git-merge-result

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 42
  • DQMHistoTests: Total histograms compared: 3250704
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3250676
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 41 files compared)
  • Checked 177 log files, 37 edm output root files, 42 DQM output files
  • TriggerResults: no differences found

@smuzaffar
Copy link
Contributor Author

@alja this looks good now, can you please sign it for visualization
@qliphy @perrotta , this should be merged with cms-sw/cmsdist#7441

@alja
Copy link
Contributor

alja commented Dec 13, 2021

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @perrotta, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

@perrotta
Copy link
Contributor

+1

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.

None yet

4 participants