diff --git a/.github/workflows/root-ci-config/build_root.py b/.github/workflows/root-ci-config/build_root.py index 55fc2bf7eb653..c16862d6bb5dd 100755 --- a/.github/workflows/root-ci-config/build_root.py +++ b/.github/workflows/root-ci-config/build_root.py @@ -346,6 +346,9 @@ def show_node_state() -> None: sw_vers || true uptime || true df || true + echo "PATH=$PATH" + echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" + echo "DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}" """) if result != 0: diff --git a/.github/workflows/root-ci-config/buildconfig/mac15.txt b/.github/workflows/root-ci-config/buildconfig/mac15.txt index 1f9f56452fbde..f508b19af91b9 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac15.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac15.txt @@ -1,3 +1,4 @@ +CMAKE_CXX_STANDARD=23 builtin_cfitsio=ON builtin_fftw3=ON builtin_freetype=ON diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index c9248b935d789..0c1684e5db850 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -120,12 +120,8 @@ jobs: # Specify platform + optional build option overrides # Build options: https://root.cern/install/build_from_source/#all-build-options include: - - platform: mac14 - arch: X64 - overrides: ["CMAKE_CXX_STANDARD=20"] - platform: mac15 - arch: ARM64 - overrides: ["CMAKE_CXX_STANDARD=23"] + arch: X64 - platform: mac26 arch: ARM64 - platform: mac-beta