diff --git a/.github/workflows/root-ci-config/build_root.py b/.github/workflows/root-ci-config/build_root.py index ac6a6085a16ae..0331738da0993 100755 --- a/.github/workflows/root-ci-config/build_root.py +++ b/.github/workflows/root-ci-config/build_root.py @@ -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: diff --git a/.github/workflows/root-ci-config/buildconfig/macOS-VM-13.txt b/.github/workflows/root-ci-config/buildconfig/macOS-VM-13.txt new file mode 100644 index 0000000000000..f1206b5371ce9 --- /dev/null +++ b/.github/workflows/root-ci-config/buildconfig/macOS-VM-13.txt @@ -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 diff --git a/.github/workflows/root-ci-config/buildconfig/macOS-VM-14.txt b/.github/workflows/root-ci-config/buildconfig/macOS-VM-14.txt new file mode 100644 index 0000000000000..a43856231ec74 --- /dev/null +++ b/.github/workflows/root-ci-config/buildconfig/macOS-VM-14.txt @@ -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 diff --git a/.github/workflows/root-ci-config/buildconfig/macOS-VM-15.txt b/.github/workflows/root-ci-config/buildconfig/macOS-VM-15.txt new file mode 100644 index 0000000000000..d1087e8e86c14 --- /dev/null +++ b/.github/workflows/root-ci-config/buildconfig/macOS-VM-15.txt @@ -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 diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 5f464b1979722..9df8862da8bc7 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -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 @@ -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 @@ -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