From 310461d207ca65f4b9a9969e9187e6b9f1218489 Mon Sep 17 00:00:00 2001
From: Stephan Hageboeck <stephan.hageboeck@cern.ch>
Date: Tue, 15 Sep 2026 17:45:51 +0200
Subject: [PATCH 1/2] [CI] Remove mac14.

- Remove mac14 because there's no more CI runners for this platform.
- The two intel runners are now running mac15.
- Move the selection of C++23 into the build config instead of a CI
  override.

(cherry picked from commit 7b6dc3902aad337d354c73ab4a65b81cb5fe8abd)
---
 .github/workflows/root-ci-config/buildconfig/mac15.txt | 1 +
 .github/workflows/root-ci.yml                          | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/root-ci-config/buildconfig/mac15.txt b/.github/workflows/root-ci-config/buildconfig/mac15.txt
index ea862adbd8042..e31b8a8d77b2e 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_cppzmq=ON
 builtin_davix=ON
diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml
index 1e765dfa5beb3..28a9092041b7a 100644
--- a/.github/workflows/root-ci.yml
+++ b/.github/workflows/root-ci.yml
@@ -103,12 +103,8 @@ jobs:
         # Common configs: {Release,Debug,RelWithDebInfo)
         # 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
 

From 48d37e91379c55819b529111a3d3899938e006a6 Mon Sep 17 00:00:00 2001
From: Stephan Hageboeck <stephan.hageboeck@cern.ch>
Date: Tue, 15 Sep 2026 18:03:24 +0200
Subject: [PATCH 2/2] [CI] Print PATH and LD_LIBRARY_PATH in Node State.

(cherry picked from commit 5b930a1f325e1f8a225de1824ec54eb44aa93ab9)
---
 .github/workflows/root-ci-config/build_root.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/root-ci-config/build_root.py b/.github/workflows/root-ci-config/build_root.py
index 42e961957873a..42e8c445af22d 100755
--- a/.github/workflows/root-ci-config/build_root.py
+++ b/.github/workflows/root-ci-config/build_root.py
@@ -319,6 +319,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: