diff --git a/.github/workflows/root-ci-config/buildconfig/global.txt b/.github/workflows/root-ci-config/buildconfig/global.txt index 06b1826abc23e..f77a150054f61 100644 --- a/.github/workflows/root-ci-config/buildconfig/global.txt +++ b/.github/workflows/root-ci-config/buildconfig/global.txt @@ -35,7 +35,6 @@ cefweb=OFF check_connection=OFF clad=ON clingtest=OFF -cocoa=OFF coverage=OFF cuda=OFF curl=ON @@ -97,6 +96,5 @@ vecgeom=OFF webgui=ON win_broken_tests=OFF winrtdebug=OFF -x11=ON xml=ON xrootd=ON diff --git a/.github/workflows/root-ci-config/buildconfig/mac-beta.txt b/.github/workflows/root-ci-config/buildconfig/mac-beta.txt index f7de3ebcdb542..40572f6b3d8d6 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac-beta.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac-beta.txt @@ -1,24 +1,8 @@ CMAKE_CXX_STANDARD=23 builtin_cfitsio=ON builtin_civetweb=ON -builtin_fftw3=ON -builtin_freetype=ON -builtin_ftgl=ON -builtin_gl2ps=ON -builtin_gsl=ON -builtin_gtest=ON -builtin_lz4=ON -builtin_nlohmannjson=ON -builtin_openssl=ON -builtin_pcre=ON -builtin_tbb=ON builtin_unuran=ON builtin_vdt=ON -builtin_xrootd=ON -builtin_xxhash=ON -builtin_zstd=ON check_connection=ON -cocoa=ON davix=OFF minuit2_omp=OFF -x11=OFF diff --git a/.github/workflows/root-ci-config/buildconfig/mac26.txt b/.github/workflows/root-ci-config/buildconfig/mac26.txt index d30211cae244e..96af0af2d5bc5 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac26.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac26.txt @@ -19,7 +19,5 @@ builtin_xrootd=ON builtin_xxhash=ON builtin_zstd=ON check_connection=ON -cocoa=ON davix=OFF minuit2_omp=OFF -x11=OFF diff --git a/.github/workflows/root-ci-config/buildconfig/mac27.txt b/.github/workflows/root-ci-config/buildconfig/mac27.txt index 1c3750173e89c..2e692118e1e0e 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac27.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac27.txt @@ -1,5 +1,3 @@ CMAKE_CXX_STANDARD=23 -cocoa=ON davix=OFF -x11=OFF diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 0af636192a117..1c988aa2bce78 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -120,7 +120,7 @@ jobs: matrix: # Specify platform + optional build option overrides # Build options: https://root.cern/install/build_from_source/#all-build-options - platform: [mac26, mac27, mac-beta] + platform: [mac26-testing, mac27, mac-beta] arch: [ARM64] include: - platform: mac15 @@ -164,7 +164,7 @@ jobs: --head_ref refs/pull/${{ github.event.pull_request.number }}/head:${{ github.event.pull_request.head.ref }} \ --head_sha ${{ github.event.pull_request.head.sha }} \ --repository ${{ github.server_url }}/${{ github.repository }} \ - --platform ${{ matrix.platform }} \ + --platform ${{ matrix.platform == 'mac26-testing' && 'mac26' || matrix.platform }} \ --overrides ${GLOBAL_OVERRIDES} ${OVERRIDES} - name: Workflow dispatch @@ -246,13 +246,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]') || - contains(github.event.pull_request.labels.*.name, 'skip ci') - )) + if: false permissions: contents: read @@ -372,13 +366,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]') || - contains(github.event.pull_request.labels.*.name, 'skip ci') - )) + if: false permissions: contents: read