Use `etc/gitinfo.txt` instead of `RGitCommit.h` #13653

Axel-Naumann · 2023-09-15T13:26:54Z

No description provided.

phsft-bot · 2023-09-15T13:27:01Z

Starting build on ROOT-performance-centos8-multicore/soversion, ROOT-ubuntu2204/nortcxxmod, ROOT-ubuntu2004/python3, mac11/noimt, mac12arm/cxx20, windows10/default
How to customize builds

github-actions · 2023-09-15T15:34:03Z

Test Results

        9 files         9 suites 2d 0h 8m 20s ⏱️
  2 477 tests   2 476 ✔️ 0 💤 1 ❌
21 378 runs 21 377 ✔️ 0 💤 1 ❌

For more details on these failures, see this check.

Results for commit 1001f12.

♻️ This comment has been updated with latest results.

config/root-config.in

phsft-bot · 2023-09-22T10:33:06Z

Starting build on ROOT-performance-centos8-multicore/soversion, ROOT-ubuntu2204/nortcxxmod, ROOT-ubuntu2004/python3, mac11/noimt, mac12arm/cxx20, windows10/default
How to customize builds

phsft-bot · 2023-09-22T10:34:29Z

Build failed on ROOT-ubuntu2204/nortcxxmod.
Running on root-ubuntu-2204-2.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

[2023-09-22T10:34:27.559Z] CMake Error at core/CMakeLists.txt:11:
[2023-09-22T10:34:27.817Z] CMake Error at /home/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1198 (message):

phsft-bot · 2023-09-22T10:46:45Z

Build failed on windows10/default.
Running on null:C:\build\workspace\root-pullrequests-build
See console output.

Errors:

[2023-09-22T10:46:44.428Z] CMake Error at core/CMakeLists.txt:11:
[2023-09-22T10:46:44.428Z] CMake Error at C:/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1198 (message):

phsft-bot · 2023-09-22T10:57:35Z

Build failed on mac11/noimt.
Running on macphsft23.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

[2023-09-22T10:57:34.135Z] CMake Error at core/CMakeLists.txt:11:
[2023-09-22T10:57:34.392Z] CMake Error at /Users/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1198 (message):

phsft-bot · 2023-09-22T11:09:39Z

Build failed on ROOT-performance-centos8-multicore/soversion.
Running on olbdw-01.cern.ch:/data/sftnight/workspace/root-pullrequests-build
See console output.

Errors:

[2023-09-22T11:09:38.052Z] CMake Error at core/CMakeLists.txt:11:
[2023-09-22T11:09:38.308Z] CMake Error at /data/sftnight/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1198 (message):

phsft-bot · 2023-09-22T11:39:09Z

Build failed on ROOT-ubuntu2004/python3.
Running on root-ubuntu-2004-3.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

[2023-09-22T11:39:07.768Z] CMake Error at core/CMakeLists.txt:11:
[2023-09-22T11:39:08.023Z] CMake Error at /home/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1198 (message):

phsft-bot · 2023-09-22T12:41:55Z

Build failed on mac12arm/cxx20.
Running on macphsft26.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

[2023-09-22T12:41:54.744Z] CMake Error at core/CMakeLists.txt:11:
[2023-09-22T12:41:54.744Z] CMake Error at /Users/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1198 (message):

This prevents TROOT.cxx from being rebuilt everytime the commit changes. Instead, use gitinfo.txt

This isn't needed at compiletime; using the text file prevents rebuilding / having to maintain `RGitCommit.h`.

Deprecate the use of `RGitCommit.h`: it triggers rebuilds where the git info is in fact not needed at compiletime; all uses are replaced by parsing `gitinfo.txt`. Instead, create `etc/gitinfo.txt` even if the source directory is not a git repo. This only works for releases (even `ROOT_PATCH_VERSION`), where the tag and the branch can be determined from the version numbers.

It can be generated at buildtime.

…_COMMIT`.

phsft-bot · 2023-09-29T08:34:12Z

Starting build on ROOT-performance-centos8-multicore/soversion, ROOT-ubuntu2204/nortcxxmod, ROOT-ubuntu2004/python3, mac11/noimt, mac12arm/cxx20, windows10/default
How to customize builds

smuzaffar · 2023-10-06T06:17:12Z

@Axel-Naumann , this change is causing few unit tests to fail for CMSSW ( see cms-sw/cmsdist#8734 (comment) ). I guess we are missing etc/gitinfo.txt file. Is this file suppose to be generated during root build process ?

Axel-Naumann · 2023-10-06T10:40:48Z

Thanks indeed, should be fixed by #13794

Axel-Naumann self-assigned this Sep 15, 2023

Axel-Naumann requested review from bellenot, gganis and pcanal as code owners September 15, 2023 13:26

Axel-Naumann added this to the 6.30/00 milestone Sep 15, 2023

Axel-Naumann mentioned this pull request Sep 15, 2023

Remove gitinfo.txt in favor of RGitCommit.h #13643

Closed

pcanal reviewed Sep 18, 2023

View reviewed changes

config/root-config.in Outdated Show resolved Hide resolved

gganis approved these changes Sep 19, 2023

View reviewed changes

Axel-Naumann force-pushed the rm-gitcommit branch from 063790b to d08d83e Compare September 22, 2023 10:32

Axel-Naumann added 8 commits September 29, 2023 10:30

[config] root-config.bat: use ROOT_VERSION cmake var also for Windows.

21c3674

[base] TROOT: rely on etc/gitinfo.txt rather than RGitCommit.h:

b2aeddf

This prevents TROOT.cxx from being rebuilt everytime the commit changes. Instead, use gitinfo.txt

[config,proofd] Rely on etc/gitinfo.txt to determine version info:

0351fef

This isn't needed at compiletime; using the text file prevents rebuilding / having to maintain `RGitCommit.h`.

[build] Do not include etc/gitinfo.txt in source tarball:

34fc7b0

It can be generated at buildtime.

[relnotes] Mention the deprecation of ROOT_GIT_BRANCH and `ROOT_GIT…

16f2707

…_COMMIT`.

[cmake] Move SetROOTVersion into dedicated file.

dee9bc4

[cmake] Move UpdateGitInfo into dedicated file.

1001f12

Axel-Naumann force-pushed the rm-gitcommit branch from d08d83e to 1001f12 Compare September 29, 2023 08:34

pcanal approved these changes Sep 29, 2023

View reviewed changes

Axel-Naumann merged commit 3739d59 into root-project:master Oct 1, 2023

Axel-Naumann deleted the rm-gitcommit branch October 1, 2023 09:59

Use etc/gitinfo.txt instead of RGitCommit.h #13653

Use etc/gitinfo.txt instead of RGitCommit.h #13653

Uh oh!

Conversation

Axel-Naumann commented Sep 15, 2023

Uh oh!

phsft-bot commented Sep 15, 2023

Uh oh!

github-actions bot commented Sep 15, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

Uh oh!

phsft-bot commented Sep 22, 2023

Uh oh!

phsft-bot commented Sep 22, 2023

Errors:

Uh oh!

phsft-bot commented Sep 22, 2023

Errors:

Uh oh!

phsft-bot commented Sep 22, 2023

Errors:

Uh oh!

phsft-bot commented Sep 22, 2023

Errors:

Uh oh!

phsft-bot commented Sep 22, 2023

Errors:

Uh oh!

phsft-bot commented Sep 22, 2023

Errors:

Uh oh!

phsft-bot commented Sep 29, 2023

Uh oh!

smuzaffar commented Oct 6, 2023

Uh oh!

Axel-Naumann commented Oct 6, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Use `etc/gitinfo.txt` instead of `RGitCommit.h` #13653

Use `etc/gitinfo.txt` instead of `RGitCommit.h` #13653

github-actions bot commented Sep 15, 2023 •

edited

Loading