Remove incremental

.github/workflows/root-634.yml

@@ -0,0 +1,34 @@
+
+name: 'ROOT 6.34'
+
+on:
+  schedule:
+    - cron: '01 1 * * *'
+
+  workflow_dispatch:
+    inputs:
+      incremental:
+        description: 'Do incremental build'
+        type: boolean
+        required: true
+        default: true
+      binaries:
+        description: Create binary packages and upload them as artifacts
+        type: boolean
+        required: true
+        default: false
+      buildtype:
+        description: The CMAKE_BUILD_TYPE to use for non-Windows.
+        type: choice
+        options:
+        - Debug
+        - RelWithDebInfo
+        - Release
+        - MinSizeRel
+        default: Debug
+        required: true
+
+jobs:
+  run_nightlies:
+    uses: root-project/root/.github/workflows/root-ci.yml@v6-34-00-patches
+    secrets: inherit

.github/workflows/root-ci-config/buildconfig/fedora41.txt

@@ -0,0 +1,5 @@
+builtin_zstd=ON
+builtin_zlib=ON
+builtin_nlohmannjson=On
+builtin_vdt=On
+pythia8=Off

.github/workflows/root-ci-config/buildconfig/ubuntu2410.txt

@@ -0,0 +1,2 @@
+pythia8=OFF
+tmva-cpu=OFF

.github/workflows/root-ci.yml

@@ -20,13 +20,13 @@ on:
     inputs:
       head_ref:
         type: string
-        default: master
+        default: v6-34-00-patches
       base_ref:
         type: string
-        default: master
+        default: v6-34-00-patches
       ref_name:
         type: string
-        default: master
+        default: v6-34-00-patches
 
   # Enables manual start of workflow
   workflow_dispatch:
@@ -153,6 +153,9 @@ jobs:
         with:
           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'
+
       - name: Pull Request Build
         if: github.event_name == 'pull_request'
         env:
@@ -358,6 +361,8 @@ jobs:
         include:
           - image: fedora40
             overrides: ["LLVM_ENABLE_ASSERTIONS=On", "CMAKE_CXX_STANDARD=20"]
+          - image: fedora41
+            overrides: ["LLVM_ENABLE_ASSERTIONS=On"]
           - image: alma8
             overrides: ["LLVM_ENABLE_ASSERTIONS=On"]
           - image: alma9
@@ -368,6 +373,8 @@ jobs:
             overrides: ["imt=Off", "LLVM_ENABLE_ASSERTIONS=On", "CMAKE_BUILD_TYPE=Debug"]
           - image: ubuntu2404
             overrides: ["LLVM_ENABLE_ASSERTIONS=On", "CMAKE_BUILD_TYPE=Debug"]
+          - image: ubuntu2410
+            overrides: ["LLVM_ENABLE_ASSERTIONS=On", "CMAKE_BUILD_TYPE=Debug"]
           - image: debian125
             overrides: ["LLVM_ENABLE_ASSERTIONS=On", "CMAKE_CXX_STANDARD=20"]
           # Special builds
@@ -388,10 +395,11 @@ jobs:
             is_special: true
             property: clang
             overrides: ["LLVM_ENABLE_ASSERTIONS=On", "CMAKE_C_COMPILER=clang", "CMAKE_CXX_COMPILER=clang++"]
-          - image: ubuntu2404-cuda
-            is_special: true
-            property: gpu
-            extra-runs-on: gpu
+            # Disable until the DNS issues are understood
+          # - image: ubuntu2404-cuda
+          #   is_special: true
+          #   property: gpu
+          #   extra-runs-on: gpu
 
     runs-on:
       - self-hosted

.github/workflows/root-docs-634.yml

@@ -0,0 +1,25 @@
+
+name: 'ROOT Docs 6.34'
+
+on:
+  schedule:
+    - cron: '0 1 * * *'
+    - cron: '0 12 * * *'
+
+  workflow_dispatch:
+    inputs:
+      incremental:
+        description: 'Do incremental build'
+        type: boolean
+        required: true
+        default: true
+      # docu_input: # opportunity: overwrite makeinput.sh with these args
+      #   description: Folders to build documentation for. All folders are built if empty.
+      #   type: string
+      #   default: ""
+      #   required: false
+
+jobs:
+  run_nightlies:
+    uses: root-project/root/.github/workflows/root-docs-ci.yml@v6-34-00-patches
+    secrets: inherit

.github/workflows/root-docs-ci.yml

@@ -0,0 +1,181 @@
+name: 'ROOT Docs CI'
+
+on:
+
+  # Allows nightly builds to trigger one run for each branch easily, by
+  # providing the relevant branch as "default" value here:
+  workflow_call:
+    inputs:
+      incremental:
+        type: boolean
+        default: true
+
+  workflow_dispatch:
+    inputs:
+      incremental:
+        description: 'Do incremental build'
+        type: boolean
+        required: true
+        default: true
+      # docu_input: # opportunity: overwrite makeinput.sh with these args
+      #   description: Folders to build documentation for. All folders are built if empty.
+      #   type: string
+      #   default: ""
+      #   required: false
+
+jobs:
+  build-docs:
+    if: github.repository_owner == 'root-project'
+
+    runs-on:
+      - self-hosted
+      - linux
+      - x64
+
+    env:
+      PLATFORM: alma9
+      DOC_DIR: v6-34-00-patches
+      DOC_LOCATION: /github/home
+      BASE_REF: v6-34-00-patches
+      WEB_DIR_NAME: v634
+      TAR_NAME: html634.tar
+
+    permissions:
+      contents: read
+
+    container:
+      image: registry.cern.ch/root-ci/alma9:buildready # ALSO UPDATE BELOW!
+      options: '--security-opt label=disable --rm --name rootdoc' # ALSO UPDATE BELOW!
+      env:
+        OS_APPLICATION_CREDENTIAL_ID: '7f5b64a265244623a3a933308569bdba'
+        OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
+        OS_AUTH_TYPE: 'v3applicationcredential'
+        OS_AUTH_URL: 'https://keystone.cern.ch/v3'
+        OS_IDENTITY_API_VERSION: 3
+        OS_INTERFACE: 'public'
+        OS_REGION_NAME: 'cern'
+        PYTHONUNBUFFERED: true
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Set up Python Virtual Env
+      # if the `if` expr is false, `if` still has exit code 0.
+      # if the `if` block is entered, the block's exit code becomes the exit
+      # code of the `if`.
+      run: 'if [ -d /py-venv/ROOT-CI/bin/ ]; then . /py-venv/ROOT-CI/bin/activate && echo PATH=$PATH >> $GITHUB_ENV; fi'
+
+    - name: Set up directory name and tar filenames
+      run: |
+        echo TAR_NAME=html${BASE_REF}.tar >> $GITHUB_ENV
+        echo DOCDIR_NAME=${BASE_REF} >> $GITHUB_ENV
+
+    # TODO: install latest versions in image on root-ci-images
+    - name: Install Doxygen 1.10.0
+      run : |
+        mkdir -p ${{ github.workspace }}/doxygen
+        curl -L https://github.com/doxygen/doxygen/releases/download/Release_1_10_0/doxygen-1.10.0.linux.bin.tar.gz | tar -xz -C ${{ github.workspace }}/doxygen/ --strip-components=1
+        echo PATH=$PATH:${{ github.workspace }}/doxygen/bin >> $GITHUB_ENV
+
+    - name: Install qhelpgenerator-qt5
+      run: |
+        dnf update -y
+        dnf upgrade -y
+        dnf install -y qt5-doctools
+        which qhelpgenerator-qt5
+
+    - name: Apply option overrides
+      env:
+        OVERRIDES: "testing=Off roottest=Off minimal=On"
+        CONFIGFILE: '.github/workflows/root-ci-config/buildconfig/alma9.txt'
+      shell: bash
+      run: |
+        set -x
+        echo '' >> "$CONFIGFILE"
+        for ENTRY in $OVERRIDES; do
+            KEY=$( echo "$ENTRY" | cut -d '=' -f 1 )
+            # Add entry to file if not exists, otherwise replace
+            if grep -q "$KEY=" "$CONFIGFILE"; then
+                sed -i "s/$KEY=.*\$/$ENTRY/" "$CONFIGFILE"
+            else
+                echo "$ENTRY" >> "$CONFIGFILE"
+            fi
+        done
+        cat "$CONFIGFILE" || true
+
+    - name: Build ROOT - Workflow Dispatch
+      if:   github.event_name == 'workflow_dispatch'
+      run: ".github/workflows/root-ci-config/build_root.py
+                  --buildtype      Release
+                  --platform       ${{ env.PLATFORM }}
+                  --incremental    false
+                  --base_ref       ${BASE_REF}
+                  --head_ref       ${BASE_REF}
+                  --binaries       false
+                  --repository     ${{ github.server_url }}/${{ github.repository }}"
+
+    - name: Build ROOT - Schedule
+      if:   github.event_name == 'schedule'
+      run: ".github/workflows/root-ci-config/build_root.py
+                  --buildtype      Release
+                  --platform       ${{ env.PLATFORM }}
+                  --incremental    false
+                  --base_ref       ${BASE_REF}
+                  --head_ref       ${BASE_REF}
+                  --binaries       false
+                  --repository     ${{ github.server_url }}/${{ github.repository }}"
+
+    - name: Run Doxygen
+      working-directory: ${{ env.DOC_LOCATION }}
+      shell: bash
+      run: |
+        source ROOT-CI/build/bin/thisroot.sh
+        export DOXYGEN_OUTPUT_DIRECTORY=/github/home/${DOC_DIR}
+        cd ROOT-CI/src/documentation/doxygen
+        make -j `nproc --all`
+
+    - name: Create documentation archives
+      working-directory: ${{ env.DOC_LOCATION }}
+      shell: bash
+      run: |
+        pwd
+        ls -l
+        echo ${DOC_DIR}
+        echo ${TAR_NAME}
+        ls -l ${DOC_DIR}
+        tar cf ${TAR_NAME} ${DOC_DIR}
+        gzip ${TAR_NAME}
+        ls -l
+
+    #Upload to GitHub as an artifact
+    - name: Upload tar file for GH
+      if:   ${{ !cancelled() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{env.TAR_NAME}}.gz
+        path: ${{env.DOC_LOCATION}}/${{env.TAR_NAME}}.gz
+        if-no-files-found: error
+
+    - name: Install AWS CLI
+      run: |
+        python -m pip install --upgrade pip
+        pip install awscli==1.36.40
+        aws configure set default.s3.max_concurrent_requests 128
+
+    - name: Sync documentation to S3
+      working-directory: ${{ env.DOC_LOCATION }}
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        AWS_ENDPOINT_URL: https://s3.cern.ch/
+
+      run: |
+        pwd
+        ls -l
+        aws s3 sync ${DOC_DIR}/html/ s3://root/doc/${WEB_DIR_NAME}/
+        rm -rf ${DOC_DIR}/html
+        aws s3 sync ${DOC_DIR}/ s3://root/doc/${WEB_DIR_NAME}/
+        aws s3 cp ${TAR_NAME}.gz s3://root/download/

CMakeLists.txt

@@ -125,7 +125,7 @@ function(relatedrepo_GetClosestMatch)
 
   # Otherwise, try to use a branch that matches `current_head` in the fork repository
   execute_process(COMMAND ${GIT_EXECUTABLE} ls-remote --heads --tags
-                  ${__ORIGIN_PREFIX}/${__REPO_NAME} ${current_head} OUTPUT_VARIABLE matching_refs)
+                  ${__ORIGIN_PREFIX}/${__REPO_NAME} ${current_head} OUTPUT_VARIABLE matching_refs ERROR_QUIET)
   if(NOT "${matching_refs}" STREQUAL "")
     set(${__FETCHURL_VARIABLE} ${__ORIGIN_PREFIX}/${__REPO_NAME} PARENT_SCOPE)
     return()
@@ -644,8 +644,12 @@ if(testing)
     endif()
     if(DEFINED repo_dir)
       execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${repo_dir}/.git
-                      remote get-url origin OUTPUT_VARIABLE originurl OUTPUT_STRIP_TRAILING_WHITESPACE)
-
+                      remote get-url origin OUTPUT_VARIABLE originurl OUTPUT_STRIP_TRAILING_WHITESPACE
+                      RESULT_VARIABLE query_result
+                      ERROR_VARIABLE query_error)
+      if(NOT query_result EQUAL 0)
+        message(STATUS "Searching for \"origin\" repo of roottest: ${query_error}")
+      endif()
     else()
        # The fetch URL of the 'origin' remote is used to determine the prefix for other repositories by
        # removing the `/root(\.git)?` part.  If `GITHUB_PR_ORIGIN` is defined in the environment, its
@@ -657,7 +661,7 @@ if(testing)
                          remote get-url origin OUTPUT_VARIABLE originurl OUTPUT_STRIP_TRAILING_WHITESPACE)
        endif()
     endif()
-    string(REGEX REPLACE "/root(test)?(\.git)?$" "" originprefix ${originurl})
+    string(REGEX REPLACE "/root(test)?(\.git)?$" "" originprefix "${originurl}")
     relatedrepo_GetClosestMatch(REPO_NAME roottest
                                 ORIGIN_PREFIX ${originprefix} UPSTREAM_PREFIX ${upstreamprefix}
                                 FETCHURL_VARIABLE roottest_url FETCHREF_VARIABLE roottest_ref)
@@ -690,7 +694,15 @@ if(testing)
 endif()
 
 if(LLVM_LINKER_IS_MOLD)
-  message(FATAL_ERROR "The mold linker is not supported by ROOT. Please use a different linker")
+  execute_process(
+    COMMAND mold --version
+    OUTPUT_VARIABLE MOLD_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  string(REGEX REPLACE "mold ([0-9]+\\.[0-9]+\\.[0-9]+).*" "\\1" MOLD_VERSION "${MOLD_VERSION}")
+  if(MOLD_VERSION VERSION_LESS "2.32.0")
+    message(FATAL_ERROR "The mold linker version ${MOLD_VERSION} is not supported by ROOT. Please use mold >= 2.32.0 or a different linker")
+  endif()
 endif()
 
 cmake_host_system_information(RESULT PROCESSOR QUERY PROCESSOR_DESCRIPTION)