From ce557c0816797e0337cf37d5cdd493083fd37335 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Thu, 21 Aug 2025 23:42:17 +0200 Subject: [PATCH 1/2] [ci] Remove redundant variables in global CI config It is important that our CI config doesn't stray away too much from the default ROOT configuration when you build from source. Like this, we are sure that we actually test more or less what people will get when building ROOT. So I would argue that it's better if we don't set configuration flags explicitly if they are set to what is already the default, to keep builds more consistent. --- .../root-ci-config/buildconfig/global.txt | 93 +------------------ .../root-ci-config/buildconfig/mac-beta.txt | 2 - .../root-ci-config/buildconfig/mac13.txt | 2 - .../root-ci-config/buildconfig/mac15.txt | 2 - 4 files changed, 1 insertion(+), 98 deletions(-) diff --git a/.github/workflows/root-ci-config/buildconfig/global.txt b/.github/workflows/root-ci-config/buildconfig/global.txt index 41becbb38f9f0..8120346124569 100644 --- a/.github/workflows/root-ci-config/buildconfig/global.txt +++ b/.github/workflows/root-ci-config/buildconfig/global.txt @@ -1,109 +1,18 @@ -alien=OFF -all=OFF -arrow=OFF -asan=OFF -asimage=ON -asserts=OFF -builtin_cfitsio=OFF -builtin_clang=ON -builtin_cling=ON builtin_cppzmq=ON -builtin_davix=OFF -builtin_fftw3=OFF -builtin_freetype=OFF -builtin_ftgl=OFF -builtin_gl2ps=OFF -builtin_glew=OFF -builtin_gsl=OFF -builtin_llvm=ON -builtin_lz4=OFF -builtin_lzma=OFF -builtin_nlohmannjson=OFF -builtin_openssl=OFF -builtin_openui5=ON -builtin_pcre=OFF -builtin_tbb=OFF -builtin_unuran=OFF -builtin_vc=OFF -builtin_vdt=OFF -builtin_veccore=OFF -builtin_xrootd=OFF -builtin_xxhash=OFF builtin_zeromq=ON -builtin_zlib=OFF -builtin_zstd=OFF ccache=ON -cefweb=OFF check_connection=OFF -clad=ON -clingtest=OFF -cocoa=OFF -coverage=OFF -cuda=OFF -daos=OFF -dataframe=ON -davix=ON -dcache=OFF -dev=OFF -distcc=OFF -fail-on-missing=On -fcgi=OFF +fail-on-missing=ON fftw3=ON fitsio=ON fortran=ON -gdml=ON -gminimal=OFF -gnuinstall=OFF -gsl_shared=OFF -gviz=OFF -http=ON -imt=ON -jemalloc=OFF -libcxx=OFF -macos_native=OFF mathmore=ON -memory_termination=OFF -minimal=OFF minuit2_omp=ON -mpi=OFF -opengl=ON -pyroot=ON -pythia8=OFF -qt6web=OFF -r=OFF -roofit=ON roofit_multiprocess=ON -root7=ON -rootbench=OFF roottest=ON -runtime_cxxmodules=ON -shadowpw=OFF -shared=ON -soversion=OFF -spectrum=ON -sqlite=ON -ssl=ON -tcmalloc=OFF test_distrdf_dask=ON test_distrdf_pyspark=ON testing=ON -tmva-cpu=ON -tmva-gpu=OFF tmva-cudnn=OFF -tmva-pymva=OFF -tmva-rmva=OFF -tmva-sofie=OFF -tmva=ON unfold=ON unuran=ON -uring=OFF -vc=OFF -vdt=ON -veccore=OFF -vecgeom=OFF -webgui=ON -win_broken_tests=OFF -winrtdebug=OFF -x11=ON -xml=ON -xrootd=ON diff --git a/.github/workflows/root-ci-config/buildconfig/mac-beta.txt b/.github/workflows/root-ci-config/buildconfig/mac-beta.txt index 77518dac321bd..9d6038ad03fa1 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac-beta.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac-beta.txt @@ -24,6 +24,4 @@ builtin_zeromq=ON builtin_zstd=ON cocoa=ON minuit2_omp=OFF -test_distrdf_dask=ON -test_distrdf_pyspark=ON x11=OFF diff --git a/.github/workflows/root-ci-config/buildconfig/mac13.txt b/.github/workflows/root-ci-config/buildconfig/mac13.txt index 474e8dddf81bb..8ad2ecc7f84c6 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac13.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac13.txt @@ -28,7 +28,5 @@ builtin_zstd=ON cocoa=ON fortran=OFF minuit2_omp=OFF -test_distrdf_dask=ON -test_distrdf_pyspark=ON tmva-sofie=ON x11=OFF diff --git a/.github/workflows/root-ci-config/buildconfig/mac15.txt b/.github/workflows/root-ci-config/buildconfig/mac15.txt index 176f3005866ee..a0078a64082f4 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac15.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac15.txt @@ -25,7 +25,5 @@ builtin_zeromq=ON builtin_zstd=ON cocoa=ON minuit2_omp=OFF -test_distrdf_dask=ON -test_distrdf_pyspark=ON tmva-sofie=ON x11=OFF From adce111c096f0f5019bbb18c344be665238d0f69 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Thu, 21 Aug 2025 23:47:13 +0200 Subject: [PATCH 2/2] [ci] Keep one build with `check_connection=ON` Since `check_connection=ON` is the default from ROOT builds from source, it is important to test this in the CI. But we don't want to test this in general, because of the constant risk that the probe file on `root.cern` can't be downloaded. So we should test it on a platform that uses builtins that trigger the connection check, and where sporadic build failues annoy us the least. The platforms that use lots of builtins and will therefore trigger the connection check forever are `windows` and `macos`. We don't have many Windows CI configs, so we should not risk one of them. Therefore, I suggest to use some `mac` platform. Let's use `mac-beta`, so the sole config with `check_connection=ON` will not be dropped without replacement in the future. --- .github/workflows/root-ci-config/buildconfig/mac-beta.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/root-ci-config/buildconfig/mac-beta.txt b/.github/workflows/root-ci-config/buildconfig/mac-beta.txt index 9d6038ad03fa1..e02645a7ff82c 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac-beta.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac-beta.txt @@ -22,6 +22,7 @@ builtin_xrootd=ON builtin_xxhash=ON builtin_zeromq=ON builtin_zstd=ON +check_connection=ON cocoa=ON minuit2_omp=OFF x11=OFF