Skip to content

[6.40] [CI] Remove mac14 from CI. #23381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hageboeck merged 2 commits into from
Sep 16, 2026
+5 −5
Merged

[6.40] [CI] Remove mac14 from CI. #23381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24ed964
[CI] Remove mac14.
hageboeck Sep 15, 2026
89ff021
[CI] Print PATH and LD_LIBRARY_PATH in Node State.
hageboeck Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/root-ci-config/build_root.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
# the target branch in the ROOT repository using base_ref and head_ref:
# - The base_ref is e.g. "master" or "v6-38-00-patches"
# - The head_ref for PRs is formatted as <PR branch>:<Fork branch> e.g. "refs/pull/20742/head:cppyy_fixup"
if not ":" in args.head_ref:

Check failure on line 62 in .github/workflows/root-ci-config/build_root.py

View workflow job for this annotation

GitHub Actions / ruff

ruff (E713) 

.github/workflows/root-ci-config/build_root.py:62:16: E713 Test for membership should be `not in`
  help: Convert to `not in`
build_utils.print_error(f"This has been identified as a PR build. However, the head-ref is {args.head_ref}.")
branch_in_fork = args.head_ref.split(":")[-1]
if branch_in_fork == args.base_ref:
Expand All @@ -85,7 +85,7 @@

if "minimal" in platform_options and platform_options["minimal"] == "ON":
options_dict = platform_options
print(f"Minimal build detected in the platform options. Ignoring global configuration.")

Check failure on line 88 in .github/workflows/root-ci-config/build_root.py

View workflow job for this annotation

GitHub Actions / ruff

ruff (F541) 

.github/workflows/root-ci-config/build_root.py:88:15: F541 f-string without any placeholders
  help: Remove extraneous `f` prefix
else:
options_dict.update(platform_options)
print(f"Build option overrides for {args.platform_config}:")
Expand Down Expand Up @@ -346,6 +346,9 @@
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:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/root-ci-config/buildconfig/mac15.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CMAKE_CXX_STANDARD=23
builtin_cfitsio=ON
builtin_fftw3=ON
builtin_freetype=ON
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/root-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,8 @@
# 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
Expand All @@ -136,7 +132,7 @@
- self-hosted
- ${{ matrix.platform }}

name: |

Check failure on line 135 in .github/workflows/root-ci.yml

View workflow job for this annotation

GitHub Actions / lint-action-files 

property "overrides" is not defined in object type {arch: string; is_special: bool; platform: string}
${{ matrix.platform }} ${{ matrix.arch }}
${{ (github.event_name != 'schedule' && github.event_name != 'workflow_dispatch' && join( matrix.overrides, ', ' )) || '' }}

Expand All @@ -157,8 +153,8 @@
HOME: /Users/sftnight
INCREMENTAL: ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') && !matrix.platform == 'mac15' && !matrix.platform == 'mac26'}}
GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }}
OVERRIDES: ${{ join( matrix.overrides, ' ') }}

Check failure on line 156 in .github/workflows/root-ci.yml

View workflow job for this annotation

GitHub Actions / lint-action-files 

property "overrides" is not defined in object type {arch: string; is_special: bool; platform: string}
run: |

Check failure on line 157 in .github/workflows/root-ci.yml

View workflow job for this annotation

GitHub Actions / lint-action-files 

"github.event.pull_request.head.ref" is potentially untrusted. avoid using it directly in inline scripts. instead, pass it through an environment variable. see https://docs.github.com/en/actions/reference/security/secure-use#good-practices-for-mitigating-script-injection-attacks for more details
[ -d "${VIRTUAL_ENV_DIR}" ] && source ${VIRTUAL_ENV_DIR}/bin/activate
echo "Python is now $(which python3) $(python3 --version)"
src/.github/workflows/root-ci-config/build_root.py \
Expand Down Expand Up @@ -203,7 +199,7 @@
- name: Update build cache after push to release branch
if: github.event_name == 'push'
env:
OVERRIDES: ${{ join( matrix.overrides, ' ') }}

Check failure on line 202 in .github/workflows/root-ci.yml

View workflow job for this annotation

GitHub Actions / lint-action-files 

property "overrides" is not defined in object type {arch: string; is_special: bool; platform: string}
run: |
[ -d "${VIRTUAL_ENV_DIR}" ] && source ${VIRTUAL_ENV_DIR}/bin/activate
echo "Python is now $(which python3) $(python3 --version)"
Expand Down Expand Up @@ -288,7 +284,7 @@
INCREMENTAL: ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') }}
GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }}
shell: cmd
run: "C:\\setenv.bat ${{ matrix.target_arch }} &&

Check failure on line 287 in .github/workflows/root-ci.yml

View workflow job for this annotation

GitHub Actions / lint-action-files 

"github.event.pull_request.head.ref" is potentially untrusted. avoid using it directly in inline scripts. instead, pass it through an environment variable. see https://docs.github.com/en/actions/reference/security/secure-use#good-practices-for-mitigating-script-injection-attacks for more details
python .github/workflows/root-ci-config/build_root.py
--buildtype ${{ matrix.config }}
--platform windows10
Expand Down
Loading