Skip to content

Conversation

@hageboeck
Copy link
Member

@hageboeck hageboeck commented Nov 27, 2025

Instead of using sed replacements in the build config files to override build options, an argument is added to build_root.py.
This allowed for removing one step from the workflow, and simplifies tracing where flags are set. The build now starts with showing every override w.r.t. to the default build config and where the override came from:

Build option overrides for mac14:
	asimage_tiff                  None --> off
	builtin_cfitsio               off --> on
	builtin_davix                 off --> on
	builtin_fftw3                 off --> on
	builtin_freetype              off --> on
	builtin_ftgl                  off --> on
	builtin_gif                   None --> on
	builtin_gl2ps                 off --> on
	builtin_glew                  off --> on
	builtin_gsl                   off --> on
	builtin_gtest                 None --> on
	builtin_jpeg                  None --> on
	builtin_lz4                   off --> on
	builtin_lzma                  off --> on
	builtin_nlohmannjson          off --> on
	builtin_openssl               off --> on
	builtin_pcre                  off --> on
	builtin_tbb                   off --> on
	builtin_unuran                off --> on
	builtin_vc                    off --> on
	builtin_vdt                   off --> on
	builtin_veccore               off --> on
	builtin_xrootd                off --> on
	builtin_xxhash                off --> on
	builtin_zstd                  off --> on
	cocoa                         off --> on
	fortran                       on --> off
	minuit2_omp                   on --> off
	test_distrdf_dask             on --> off
	test_distrdf_pyspark          on --> off
	tmva-sofie                    off --> on
	x11                           on --> off
Build option overrides from command line:
	CMAKE_CXX_STANDARD            None --> 20
	LLVM_ENABLE_ASSERTIONS        None --> ON
	asserts                       off --> ON
Full build options
	CMAKE_CXX_STANDARD            20
	LLVM_ENABLE_ASSERTIONS        ON
	alien                         off
	all                           off
	arrow                         off
	asan                          off
[...]

@hageboeck hageboeck self-assigned this Nov 27, 2025
@hageboeck hageboeck force-pushed the simplify-ci-override branch from 4864ee8 to 2a9e470 Compare November 27, 2025 09:51
@github-actions
Copy link

github-actions bot commented Nov 27, 2025

Test Results

    22 files      22 suites   3d 19h 18m 2s ⏱️
 3 778 tests  3 776 ✅ 0 💤 2 ❌
81 186 runs  81 184 ✅ 0 💤 2 ❌

For more details on these failures, see this check.

Results for commit bb9b61f.

♻️ This comment has been updated with latest results.

@hageboeck hageboeck force-pushed the simplify-ci-override branch 3 times, most recently from 2a85bc4 to bcf6bab Compare November 27, 2025 14:01
@hageboeck hageboeck marked this pull request as ready for review November 27, 2025 14:02
@hageboeck hageboeck requested a review from dpiparo as a code owner November 27, 2025 14:02
Moving the imports of openstack and requests to the place where they are
used allows for running the script locally without openstack or S3
access.
Only if one attempts downloads or uploads, the imports become necessary.
@hageboeck hageboeck force-pushed the simplify-ci-override branch from bcf6bab to 401b037 Compare November 27, 2025 14:12
Instead of using sed to replace lines in the build config files, pass
option overrides directly to build_root.py.
This leaves the build config files untouched, shows more clearly
which builds run with overrides, prints these to the logs, and allows
to remove an extra step from the CI.
@hageboeck hageboeck force-pushed the simplify-ci-override branch from 401b037 to bb9b61f Compare November 27, 2025 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants