From 3c83bad075609333e644b365cdd145eef17dcd0c Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Wed, 14 May 2025 11:31:38 +0200 Subject: [PATCH 01/14] removed linux and windows runners from the matrix, as well as mac13 and mac14 bare-metal runners for testing purposes --- .github/workflows/root-ci.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 5f464b1979722..d92ceef5b4168 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -96,17 +96,10 @@ jobs: # Common configs: {Release,Debug,RelWithDebInfo) # Build options: https://root.cern/install/build_from_source/#all-build-options include: - - platform: mac13 - arch: ARM64 - overrides: ["builtin_zlib=ON"] - - platform: mac14 - 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 arch: ARM64 overrides: ["CMAKE_CXX_STANDARD=23"] @@ -224,9 +217,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 +336,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 From d8867ed70445a840057ccd5b97e943438fe40a40 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Fri, 16 May 2025 11:33:17 +0200 Subject: [PATCH 02/14] Create macOS-VM.txt --- .../root-ci-config/buildconfig/macOS-VM.txt | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/root-ci-config/buildconfig/macOS-VM.txt diff --git a/.github/workflows/root-ci-config/buildconfig/macOS-VM.txt b/.github/workflows/root-ci-config/buildconfig/macOS-VM.txt new file mode 100644 index 0000000000000..6a6c80ed31924 --- /dev/null +++ b/.github/workflows/root-ci-config/buildconfig/macOS-VM.txt @@ -0,0 +1,32 @@ +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 +fortran=OFF +pythia8=OFF +test_distrdf_dask=ON +test_distrdf_pyspark=ON +tmva-sofie=ON +x11=OFF From 6559bc53fcd35738c1b2788f4e78d2b7ff0c37cc Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Fri, 23 May 2025 10:32:03 +0200 Subject: [PATCH 03/14] macvm13 testing --- .github/workflows/root-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index d92ceef5b4168..f8d54a63de6b9 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -96,12 +96,12 @@ jobs: # Common configs: {Release,Debug,RelWithDebInfo) # Build options: https://root.cern/install/build_from_source/#all-build-options include: - - platform: mac15 + - platform: mac13 arch: ARM64 - overrides: ["CMAKE_CXX_STANDARD=23"] + overrides: ["builtin_zlib=ON"] - platform: macOS-VM arch: ARM64 - overrides: ["CMAKE_CXX_STANDARD=23"] + overrides: ["builtin_zlib=ON"] runs-on: # Using '[self-hosted, ..., ...]' does not work for some reason :) - self-hosted From b3487cfbbe1e19105ccebc924f5180d95f57ade9 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Mon, 26 May 2025 17:15:34 +0200 Subject: [PATCH 04/14] Rename macOS-VM.txt to macOS-VM-15.txt --- .../root-ci-config/buildconfig/{macOS-VM.txt => macOS-VM-15.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/root-ci-config/buildconfig/{macOS-VM.txt => macOS-VM-15.txt} (100%) diff --git a/.github/workflows/root-ci-config/buildconfig/macOS-VM.txt b/.github/workflows/root-ci-config/buildconfig/macOS-VM-15.txt similarity index 100% rename from .github/workflows/root-ci-config/buildconfig/macOS-VM.txt rename to .github/workflows/root-ci-config/buildconfig/macOS-VM-15.txt From 81dbb996c394de6ffe673bbf35d1c1f0ce15d9ae Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Mon, 26 May 2025 17:16:07 +0200 Subject: [PATCH 05/14] Create macOS-VM-13 --- .../root-ci-config/buildconfig/macOS-VM-13 | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/root-ci-config/buildconfig/macOS-VM-13 diff --git a/.github/workflows/root-ci-config/buildconfig/macOS-VM-13 b/.github/workflows/root-ci-config/buildconfig/macOS-VM-13 new file mode 100644 index 0000000000000..7f83c3f3cf248 --- /dev/null +++ b/.github/workflows/root-ci-config/buildconfig/macOS-VM-13 @@ -0,0 +1,35 @@ +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 +pythia8=OFF +test_distrdf_dask=ON +test_distrdf_pyspark=ON +tmva-sofie=ON +x11=OFF From ffd43500369eefc6d948bb51188e883b03515e47 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Mon, 26 May 2025 17:16:26 +0200 Subject: [PATCH 06/14] Rename macOS-VM-13 to macOS-VM-13.txt --- .../root-ci-config/buildconfig/{macOS-VM-13 => macOS-VM-13.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/root-ci-config/buildconfig/{macOS-VM-13 => macOS-VM-13.txt} (100%) diff --git a/.github/workflows/root-ci-config/buildconfig/macOS-VM-13 b/.github/workflows/root-ci-config/buildconfig/macOS-VM-13.txt similarity index 100% rename from .github/workflows/root-ci-config/buildconfig/macOS-VM-13 rename to .github/workflows/root-ci-config/buildconfig/macOS-VM-13.txt From 5c99e962ed5f8b2b376eba1cf708526fce0ef120 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Mon, 26 May 2025 17:23:46 +0200 Subject: [PATCH 07/14] Update root-ci.yml --- .github/workflows/root-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index f8d54a63de6b9..4d14d4b2e9bbc 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -99,7 +99,7 @@ jobs: - platform: mac13 arch: ARM64 overrides: ["builtin_zlib=ON"] - - platform: macOS-VM + - platform: macOS-VM-13 arch: ARM64 overrides: ["builtin_zlib=ON"] From 85040edba54eb56ce8711e2ebbf212797f2ad0bb Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Tue, 27 May 2025 10:14:44 +0200 Subject: [PATCH 08/14] Update root-ci.yml --- .github/workflows/root-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 4d14d4b2e9bbc..9df8862da8bc7 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -102,6 +102,18 @@ jobs: - 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: macOS-VM-15 + arch: ARM64 + overrides: ["CMAKE_CXX_STANDARD=23"] runs-on: # Using '[self-hosted, ..., ...]' does not work for some reason :) - self-hosted From 54226cbb8a0c2be0d2c5849e739aaec6f5ee4850 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Tue, 1 Jul 2025 10:52:41 +0200 Subject: [PATCH 09/14] Update macOS-VM-13.txt --- .github/workflows/root-ci-config/buildconfig/macOS-VM-13.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/root-ci-config/buildconfig/macOS-VM-13.txt b/.github/workflows/root-ci-config/buildconfig/macOS-VM-13.txt index 7f83c3f3cf248..f1206b5371ce9 100644 --- a/.github/workflows/root-ci-config/buildconfig/macOS-VM-13.txt +++ b/.github/workflows/root-ci-config/buildconfig/macOS-VM-13.txt @@ -28,6 +28,7 @@ builtin_zstd=ON ccache=ON cocoa=ON fortran=OFF +minuit2_omp=OFF pythia8=OFF test_distrdf_dask=ON test_distrdf_pyspark=ON From d0ce3d9ff50d53eb9dad5ec2677e8e98578cc4e4 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Tue, 1 Jul 2025 12:48:13 +0200 Subject: [PATCH 10/14] moving ROOT-CI to build_drive --- .github/workflows/root-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 9df8862da8bc7..863ade0f96d39 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -158,7 +158,7 @@ jobs: - uses: root-project/gcc-problem-matcher-improved@main with: - build-directory: /Users/sftnight/ROOT-CI/src/ + build-directory: /Users/sftnight/build/ROOT-CI/src/ - name: Set up curl CA bundle for Davix to work with https run: 'echo SSL_CERT_FILE=/opt/local/share/curl/curl-ca-bundle.crt >> $GITHUB_ENV' @@ -215,14 +215,14 @@ jobs: uses: actions/upload-artifact@v4 with: name: Test Results ${{ matrix.platform }} ${{ matrix.arch }} - path: /Users/sftnight/ROOT-CI/build/TestResults.xml + path: /Users/sftnight/build/ROOT-CI/build/TestResults.xml - name: Upload binaries if: ${{ !cancelled() && (inputs.binaries || github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) }} uses: actions/upload-artifact@v4 with: name: Binaries ${{ matrix.platform }} ${{ matrix.arch }} - path: /Users/sftnight/ROOT-CI/packages/root_v* + path: /Users/sftnight/build/ROOT-CI/packages/root_v* if-no-files-found: error From da46ba13b6ec7acb3d30b7f96d0fe1b420c49e98 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Tue, 1 Jul 2025 12:55:16 +0200 Subject: [PATCH 11/14] Update root-ci.yml --- .github/workflows/root-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 863ade0f96d39..9df8862da8bc7 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -158,7 +158,7 @@ jobs: - uses: root-project/gcc-problem-matcher-improved@main with: - build-directory: /Users/sftnight/build/ROOT-CI/src/ + build-directory: /Users/sftnight/ROOT-CI/src/ - name: Set up curl CA bundle for Davix to work with https run: 'echo SSL_CERT_FILE=/opt/local/share/curl/curl-ca-bundle.crt >> $GITHUB_ENV' @@ -215,14 +215,14 @@ jobs: uses: actions/upload-artifact@v4 with: name: Test Results ${{ matrix.platform }} ${{ matrix.arch }} - path: /Users/sftnight/build/ROOT-CI/build/TestResults.xml + path: /Users/sftnight/ROOT-CI/build/TestResults.xml - name: Upload binaries if: ${{ !cancelled() && (inputs.binaries || github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) }} uses: actions/upload-artifact@v4 with: name: Binaries ${{ matrix.platform }} ${{ matrix.arch }} - path: /Users/sftnight/build/ROOT-CI/packages/root_v* + path: /Users/sftnight/ROOT-CI/packages/root_v* if-no-files-found: error From 4c0871d50daa0f24cf3351252d1a90168130ccb3 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Tue, 1 Jul 2025 12:59:43 +0200 Subject: [PATCH 12/14] do not delete the directory - only all contents (to allow symlinks for /ROOT-CI on mac VMs) --- .github/workflows/root-ci-config/build_root.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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: From 0570cab4a6813894c1f6504a6003a10e7bef8fe2 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Tue, 1 Jul 2025 13:28:51 +0200 Subject: [PATCH 13/14] Update macOS-VM-15.txt --- .github/workflows/root-ci-config/buildconfig/macOS-VM-15.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/root-ci-config/buildconfig/macOS-VM-15.txt b/.github/workflows/root-ci-config/buildconfig/macOS-VM-15.txt index 6a6c80ed31924..d1087e8e86c14 100644 --- a/.github/workflows/root-ci-config/buildconfig/macOS-VM-15.txt +++ b/.github/workflows/root-ci-config/buildconfig/macOS-VM-15.txt @@ -1,3 +1,4 @@ +CMAKE_BUILD_RPATH=/usr/local/lib builtin_cfitsio=ON builtin_cppzmq=ON builtin_davix=ON @@ -24,7 +25,7 @@ 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 From 00fc0c23271fe3cebe7c34af16f62146fe9a3005 Mon Sep 17 00:00:00 2001 From: Nils Langguth Date: Tue, 1 Jul 2025 13:28:55 +0200 Subject: [PATCH 14/14] Create macOS-VM-14.txt --- .../buildconfig/macOS-VM-14.txt | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/root-ci-config/buildconfig/macOS-VM-14.txt 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