Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,30 @@
explicitly appended to the shell log.
e.g. `os.chdir(x)` requires `cd x` to be appended to the shell log """

import argparse
import datetime
import os
import platform
import re
import shutil
import subprocess
import sys
import tarfile
import time

import openstack

from build_utils import (
die,
github_log_group,
load_config,
calc_options_hash,
subprocess_with_log,
subprocess_with_capture,
upload_file,
is_macos
)
import build_utils

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

View workflow job for this annotation

GitHub Actions / ruff

ruff (I001)

.github/workflows/root-ci-config/build_root.py:16:1: I001 Import block is un-sorted or un-formatted help: Organize imports

S3CONTAINER = 'ROOT-build-artifacts' # Used for uploads
S3URL = 'https://s3.cern.ch/swift/v1/' + S3CONTAINER # Used for downloads
Expand Down Expand Up @@ -319,6 +319,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
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CMAKE_CXX_STANDARD=23
builtin_cfitsio=ON
builtin_cppzmq=ON
builtin_davix=ON
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/root-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading