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 @@ -364,6 +364,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:
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_civetweb=ON
builtin_fftw3=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 @@ -121,12 +121,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 @@ -137,7 +133,7 @@
- self-hosted
- ${{ matrix.platform }}

name: |

Check failure on line 136 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 @@ -156,8 +152,8 @@
if: github.event_name == 'pull_request'
env:
GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }}
OVERRIDES: ${{ join( matrix.overrides, ' ') }}

Check failure on line 155 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 156 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 @@ -189,7 +185,7 @@
- name: Nightlies and push to branch
if: github.event_name == 'schedule' || github.event_name == 'push'
env:
OVERRIDES: ${{ github.event_name == 'push' && format('{0} {1} {2}', '--overrides', env.GLOBAL_OVERRIDES, join( matrix.overrides, ' ')) || '' }}

Check failure on line 188 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}
BASE_REF: ${{ github.event_name == 'push' && github.ref_name || inputs.ref_name }}
run: |
[ -d "${VIRTUAL_ENV_DIR}" ] && source ${VIRTUAL_ENV_DIR}/bin/activate
Expand Down
Loading