Skip to content

[DO NOT MERGE] removed linux and windows runners from the matrix, as well as mac13 a… #18743

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.

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

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open
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: 1 addition & 2 deletions .github/workflows/root-ci-config/build_root.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,7 @@ def cleanup_previous_build():
else:
# mac/linux/POSIX
result = subprocess_with_log(f"""
rm -rf {WORKDIR}
mkdir -p {WORKDIR}
rm -rf {WORKDIR}/*
""")

if result != 0:
Expand Down
36 changes: 36 additions & 0 deletions .github/workflows/root-ci-config/buildconfig/macOS-VM-13.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
asimage_tiff=OFF
builtin_cfitsio=ON
builtin_cppzmq=ON
builtin_davix=ON
builtin_fftw3=ON
builtin_freetype=ON
builtin_ftgl=ON
builtin_gif=ON
builtin_gl2ps=ON
builtin_glew=ON
builtin_gsl=ON
builtin_gtest=ON
builtin_jpeg=ON
builtin_lz4=ON
builtin_lzma=ON
builtin_nlohmannjson=ON
builtin_openssl=ON
builtin_pcre=ON
builtin_tbb=ON
builtin_unuran=ON
builtin_vc=ON
builtin_vdt=ON
builtin_veccore=ON
builtin_xrootd=ON
builtin_xxhash=ON
builtin_zeromq=ON
builtin_zstd=ON
ccache=ON
cocoa=ON
fortran=OFF
minuit2_omp=OFF
pythia8=OFF
test_distrdf_dask=ON
test_distrdf_pyspark=ON
tmva-sofie=ON
x11=OFF
36 changes: 36 additions & 0 deletions .github/workflows/root-ci-config/buildconfig/macOS-VM-14.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
asimage_tiff=OFF
builtin_cfitsio=ON
builtin_cppzmq=ON
builtin_davix=ON
builtin_fftw3=ON
builtin_freetype=ON
builtin_ftgl=ON
builtin_gif=ON
builtin_gl2ps=ON
builtin_glew=ON
builtin_gsl=ON
builtin_gtest=ON
builtin_jpeg=ON
builtin_lz4=ON
builtin_lzma=ON
builtin_nlohmannjson=ON
builtin_openssl=ON
builtin_pcre=ON
builtin_tbb=ON
builtin_unuran=ON
builtin_vc=ON
builtin_vdt=ON
builtin_veccore=ON
builtin_xrootd=ON
builtin_xxhash=ON
builtin_zeromq=ON
builtin_zstd=ON
ccache=ON
cocoa=ON
fortran=OFF
minuit2_omp=OFF
pythia8=OFF
test_distrdf_dask=OFF
test_distrdf_pyspark=OFF
tmva-sofie=ON
x11=OFF
33 changes: 33 additions & 0 deletions .github/workflows/root-ci-config/buildconfig/macOS-VM-15.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
CMAKE_BUILD_RPATH=/usr/local/lib
builtin_cfitsio=ON
builtin_cppzmq=ON
builtin_davix=ON
builtin_fftw3=ON
builtin_freetype=ON
builtin_ftgl=ON
builtin_gl2ps=ON
builtin_glew=ON
builtin_gsl=ON
builtin_gtest=ON
builtin_lz4=ON
builtin_lzma=ON
builtin_nlohmannjson=ON
builtin_openssl=ON
builtin_pcre=ON
builtin_tbb=ON
builtin_unuran=ON
builtin_vc=ON
builtin_vdt=ON
builtin_veccore=ON
builtin_xrootd=ON
builtin_xxhash=ON
builtin_zeromq=ON
builtin_zstd=ON
ccache=ON
cocoa=ON
minuit2_omp=OFF
pythia8=OFF
test_distrdf_dask=ON
test_distrdf_pyspark=ON
tmva-sofie=ON
x11=OFF
19 changes: 10 additions & 9 deletions .github/workflows/root-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,23 @@ jobs:
# Build options: https://root.cern/install/build_from_source/#all-build-options
include:
- platform: mac13
arch: ARM64
overrides: ["builtin_zlib=ON"]
- platform: macOS-VM-13
arch: ARM64
overrides: ["builtin_zlib=ON"]
- platform: mac14
arch: X64
overrides: ["CMAKE_CXX_STANDARD=20"]
- platform: macOS-VM-14
arch: X64
overrides: ["CMAKE_CXX_STANDARD=20"]
- platform: mac15
arch: ARM64
overrides: ["CMAKE_CXX_STANDARD=23"]
- platform: mac-beta
is_special: true
- platform: macOS-VM-15
arch: ARM64
overrides: ["CMAKE_CXX_STANDARD=23"]
overrides: ["CMAKE_CXX_STANDARD=23"]

runs-on: # Using '[self-hosted, ..., ...]' does not work for some reason :)
- self-hosted
Expand Down Expand Up @@ -224,9 +229,7 @@ jobs:
build-windows:
# For any event that is not a PR, the CI will always run. In PRs, the CI
# can be skipped if the tag [skip-ci] or [skip ci] is written in the title.
if: |
(github.repository_owner == 'root-project' && github.event_name != 'pull_request') ||
(github.event_name == 'pull_request' && !(contains(github.event.pull_request.title, '[skip-ci]') || contains(github.event.pull_request.title, '[skip ci]')))
if: false

permissions:
contents: read
Expand Down Expand Up @@ -345,9 +348,7 @@ jobs:
build-linux:
# For any event that is not a PR, the CI will always run. In PRs, the CI
# can be skipped if the tag [skip-ci] or [skip ci] is written in the title.
if: |
(github.repository_owner == 'root-project' && github.event_name != 'pull_request') ||
(github.event_name == 'pull_request' && !(contains(github.event.pull_request.title, '[skip-ci]') || contains(github.event.pull_request.title, '[skip ci]')))
if: false

permissions:
contents: read
Expand Down
Loading