Merge branch 'master' into reduce-memory-usage

Author: ktf

.clang-format

@@ -46,19 +46,6 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories:
-  - Regex:           '^("|<)T'
-    Priority:        4
-  - Regex:           '^("|<)ROOT/'
-    Priority:        5
-  - Regex:           '^<.*\.h>'
-    Priority:        1
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
-    Priority:        6
 IndentCaseLabels: false
 IndentWidth:     3
 IndentWrappedFunctionNames: false
@@ -99,6 +86,8 @@ UseTab:          Never
 IncludeCategories:
   - Regex:           '^"[^/]+\"'
     Priority:        10
+  - Regex:           '^("|<)T'
+    Priority:        12
   - Regex:           '^"ROOT/'
     Priority:        15
   - Regex:           '^"cling/'

.github/workflows/root-ci-config/build_root.py

@@ -18,6 +18,7 @@
 import os
 import shutil
 import subprocess
+import sys
 import tarfile
 from hashlib import sha1
 
@@ -37,7 +38,8 @@
 
 try:
     CONNECTION = openstack.connect(cloud='envvars')
-except:
+except Exception as exc:
+    print("Failed to open the S3 connection:", exc, file=sys.stderr)
     CONNECTION = None
 
 WINDOWS = (os.name == 'nt')
@@ -312,7 +314,7 @@ def archive_and_upload(archive_name, prefix):
 @github_log_group("Configure")
 def cmake_configure(options, buildtype):
     result = subprocess_with_log(f"""
-        cmake -S '{WORKDIR}/src' -B '{WORKDIR}/build' {options} -DCMAKE_BUILD_TYPE={buildtype}
+        cmake -S '{WORKDIR}/src' -B '{WORKDIR}/build' -DCMAKE_BUILD_TYPE={buildtype} {options}
     """)
 
     if result != 0:
@@ -368,7 +370,8 @@ def build(options, buildtype):
 def create_binaries(buildtype):
     os.makedirs(f"{WORKDIR}/packages/", exist_ok=True)
     result = subprocess_with_log(f"""
-        cd '{WORKDIR}/build' && cpack -B {WORKDIR}/packages/ --verbose -C {buildtype}
+        cd '{WORKDIR}/build'
+        cpack -B {WORKDIR}/packages/ --verbose -C {buildtype}
     """)
 
     if result != 0:

.github/workflows/root-ci-config/buildconfig/alma8.txt

@@ -0,0 +1,3 @@
+builtin_gtest=ON
+builtin_nlohmannjson=ON
+builtin_vdt=On

.github/workflows/root-ci-config/buildconfig/alma9.txt

@@ -0,0 +1,2 @@
+builtin_nlohmannjson=ON
+builtin_vdt=On

.github/workflows/root-ci-config/buildconfig/fedora37.txt

@@ -1,3 +1,4 @@
+builtin_nlohmannjson=ON
+builtin_vdt=On
 tmva-pymva=Off
 test_distrdf_pyspark=OFF
-CMAKE_CXX_STANDARD=17

.github/workflows/root-ci-config/buildconfig/fedora38.txt

@@ -1,4 +1,5 @@
+builtin_nlohmannjson=ON
+builtin_vdt=On
+pythia8=Off
 tmva-pymva=Off
 test_distrdf_pyspark=OFF
-pythia8=Off
-CMAKE_CXX_STANDARD=20

.github/workflows/root-ci-config/buildconfig/fedora39.txt

@@ -1,3 +1,4 @@
-tmva-pymva=Off
+builtin_nlohmannjson=On
+builtin_vdt=On
 pythia8=Off
-CMAKE_CXX_STANDARD=20
+tmva-pymva=Off

.github/workflows/root-ci-config/buildconfig/global.txt

@@ -1,4 +1,3 @@
-LLVM_ENABLE_ASSERTIONS=On
 alien=OFF
 all=OFF
 arrow=OFF
@@ -49,13 +48,13 @@ davix=ON
 dcache=OFF
 dev=OFF
 distcc=OFF
-exceptions=ON
+fail-on-missing=On
 fcgi=OFF
 fftw3=ON
 fitsio=ON
 fortran=OFF
 gdml=ON
-gfal=ON
+gfal=OFF
 gminimal=OFF
 gnuinstall=OFF
 gsl_shared=OFF
@@ -69,17 +68,16 @@ mathmore=ON
 memory_termination=OFF
 minimal=OFF
 minuit2=ON
-mlp=ON
 monalisa=OFF
 mpi=OFF
 mysql=ON
 odbc=OFF
 opengl=ON
-oracle=ON
+oracle=OFF
 pgsql=ON
 pyroot=ON
 pyroot_legacy=OFF
-pythia6=ON
+pythia6=OFF
 pythia6_nolink=OFF
 pythia8=ON
 qt5web=OFF

.github/workflows/root-ci-config/buildconfig/mac14.txt

@@ -1,4 +1,3 @@
-CMAKE_CXX_STANDARD=20
 builtin_afterimage=ON
 builtin_cfitsio=ON
 builtin_cppzmq=ON
@@ -9,8 +8,12 @@ builtin_ftgl=ON
 builtin_gl2ps=ON
 builtin_glew=ON
 builtin_gsl=ON
+builtin_gtest=ON
 builtin_lz4=ON
+builtin_lzma=ON
 builtin_nlohmannjson=ON
+builtin_pcre=ON
+builtin_openssl=ON
 builtin_tbb=ON
 builtin_unuran=ON
 builtin_vc=ON

.github/workflows/root-ci-config/buildconfig/ubuntu18.txt

@@ -1,2 +1 @@
-CMAKE_CXX_STANDARD=17
-root7=OFF
+root7=OFF

.github/workflows/root-ci-config/buildconfig/ubuntu20.txt

@@ -1 +1,3 @@
-CMAKE_CXX_STANDARD=17
+builtin_nlohmannjson=ON
+builtin_vdt=ON
+builtin_xrootd=ON

.github/workflows/root-ci-config/buildconfig/ubuntu22.txt

@@ -0,0 +1,3 @@
+builtin_vdt=ON
+pythia8=OFF
+

.github/workflows/root-ci-config/buildconfig/ubuntu2304.txt

@@ -0,0 +1,2 @@
+pythia8=OFF
+

.github/workflows/root-ci-config/buildconfig/ubuntu2310.txt

@@ -0,0 +1,2 @@
+pythia8=OFF
+

.github/workflows/root-ci-config/buildconfig/windows.txt

@@ -17,7 +17,7 @@ builtin_zlib=ON
 builtin_zstd=ON
 cudnn=OFF
 davix=OFF
-exceptions=ON
+fftw3=OFF
 gfal=OFF
 llvm13_broken_tests=OFF
 minuit2_mpi=OFF