Merge branch 'main' into fix/binning_scalar_type

.clang-tidy

@@ -21,7 +21,6 @@ Checks: '-*, \
   readability-named-parameter, \
   readability-operators-representation'
 HeaderFilterRegex: '.*(?<!nlohmann\/json)\.(hpp|cpp|ipp)$'
-AnalyzeTemporaryDtors: true
 CheckOptions:
   readability-operators-representation.BinaryOperators: '&&;&=;&;|;~;!;!=;||;|=;^;^='
   readability-operators-representation.OverloadedOperators: '&&;&=;&;|;~;!;!=;||;|=;^;^='

.github/pull_request_template.md

@@ -8,26 +8,26 @@ REQUEST.
 
     The prefix must be one of:
 
-    - `fix`: for a bugfix
-    - `feat`: for a new feature
-    - `refactor`: for an improvement of an existing feature
-    - `perf`, `test`: for performance- or test-related changes
-    - `docs`: for documentation-related changes
-    - `build`, `ci`, `chore`: as appropriated for infrastructure changes
+  - `fix`: for a bugfix
+  - `feat`: for a new feature
+  - `refactor`: for an improvement of an existing feature
+  - `perf`, `test`: for performance- or test-related changes
+  - `docs`: for documentation-related changes
+  - `build`, `ci`, `chore`: as appropriated for infrastructure changes
 
 - [ ] Does this modify the public API as defined in `docs/versioning.rst`?
 
-    - [ ] Does the PR title contain a `!` to indicate a breaking change?
-    - [ ] Is there section starting with `BREAKING CHANGE:` in the PR body
+  - [ ] Does the PR title contain a `!` to indicate a breaking change?
+  - [ ] Is there section starting with `BREAKING CHANGE:` in the PR body
           that explains the breaking change?
 
 - [ ] Is the PR ready to be merged?
 
-    - [ ] If not: is it marked as a draft PR?
+  - [ ] If not: is it marked as a draft PR?
 
 - [ ] Does this PR close an existing issue?
 
-    - [ ] Is the issue correctly linked so it will be automatically closed
+  - [ ] Is the issue correctly linked so it will be automatically closed
         upon successful merge (See closing keywords link in the sidebar)?
 
 - The CI will initially report a missing milestone. One of the maintainers will
@@ -36,6 +36,6 @@ REQUEST.
 - An automated workflow will assign labels based on changed files, and whether
   or not reference files were changed. These do not have to be set manually.
 
-- If you push updates, and you know they will be superceded later on, consider adding
+- If you push updates, and you know they will be superseded later on, consider adding
   `[skip ci]` in the commit message. This will instruct the CI system not to run any
   jobs on this commit.

.github/workflows/analysis.yml

@@ -29,7 +29,7 @@ env:
 jobs:
   build_debug:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:53
+    container: ghcr.io/acts-project/ubuntu2404:58
     steps:
 
       - uses: actions/checkout@v4
@@ -86,7 +86,7 @@ jobs:
 
   build_performance:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:53
+    container: ghcr.io/acts-project/ubuntu2404:58
     if: github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v4

.github/workflows/builds.yml

@@ -24,7 +24,7 @@ env:
 jobs:
   linux_ubuntu:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:53
+    container: ghcr.io/acts-project/ubuntu2404:58
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
@@ -59,7 +59,6 @@ jobs:
           --preset=github-ci
           -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
           -DACTS_BUILD_PLUGIN_ONNX=ON
-          -DACTS_BUILD_PLUGIN_GEOMODEL=ON
 
       - name: Build
         run: cmake --build build
@@ -109,7 +108,7 @@ jobs:
 
   linux_examples_test:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:53
+    container: ghcr.io/acts-project/ubuntu2404:58
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
@@ -146,7 +145,7 @@ jobs:
 
   linux_physmon:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:53
+    container: ghcr.io/acts-project/ubuntu2404:58
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
@@ -179,7 +178,7 @@ jobs:
         run: >
           echo "::group::Dependencies"
           && git config --global safe.directory "$GITHUB_WORKSPACE"
-          && pip3 install histcmp==0.6.6 matplotlib
+          && pip3 install histcmp==0.6.7 matplotlib
           && pip3 install -r Examples/Scripts/requirements.txt
           && /usr/local/bin/geant4-config --install-datasets
           && source build/this_acts_withdeps.sh
@@ -233,7 +232,7 @@ jobs:
             std: 20
           - image: ubuntu2204_clang
             std: 20
-    container: ghcr.io/acts-project/${{ matrix.image }}:53
+    container: ghcr.io/acts-project/${{ matrix.image }}:58
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
@@ -310,7 +309,7 @@ jobs:
       INSTALL_DIR: ${{ github.workspace }}/install_acts
       DEPENDENCY_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
-      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macOS/cmake/deps.8a95213.tar.zst
+      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macos-14/deps.v2.tar.zst
       # Works around an issue where root's RPATH is wrong for tbb, thus won't find it
       DYLD_LIBRARY_PATH: "${{ github.workspace }}/install/tbb/2021.11.0/lib"
     steps:
@@ -341,9 +340,6 @@ jobs:
             ${{ runner.os  }}-ccache_${{ env.CCACHE_KEY_SUFFIX }}_
 
       - name: Configure
-        # setting CMAKE_CXX_STANDARD=20 is a workaround for a bug in the
-        # dd4hep CMake configuration that gets triggered on recent CMake
-        # versions such as the one installed via homebrew
         run: >
           ccache -z
           && PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
@@ -352,7 +348,6 @@ jobs:
           -DCMAKE_PREFIX_PATH="${{ env.DEPENDENCY_DIR }}"
           -DPython_EXECUTABLE=${{ env.DEPENDENCY_DIR }}/bin/python3
           -DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}"
-          -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=OFF
       - name: Build
         run: cmake --build build
       - name: ccache stats

.github/workflows/sonarcloud.yml

@@ -23,6 +23,8 @@ jobs:
 
       - name: "Checkout repository"
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # To prevent shallow clone
 
       - name: 'Download artifact'
         uses: actions/github-script@v7

.gitlab-ci.yml

@@ -6,7 +6,7 @@ variables:
 
 clang_tidy:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2404:53
+  image: ghcr.io/acts-project/ubuntu2404:58
   tags:
     - large
   artifacts:
@@ -55,7 +55,7 @@ clang_tidy:
 
 build_exatrkx_cpu:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2204_exatrkx:52
+  image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
   tags:
     - large
 
@@ -74,19 +74,19 @@ build_exatrkx_cpu:
     - git checkout $HEAD_SHA
     - cd ..
     - mkdir build
-    # Here we only do a minimal build without examples to save ressources
+    # Here we only do a minimal build without examples to save resources
     - >
       cmake -B build -S src
       --preset=gitlab-ci-exatrkx
       -DACTS_EXATRKX_ENABLE_CUDA=OFF
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
 build_exatrkx:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2204_exatrkx:52
+  image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
   tags:
     - large
 
@@ -119,14 +119,14 @@ build_exatrkx:
       -DCMAKE_CUDA_ARCHITECTURES="75;86"
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
 # test_exatrkx_unittests:
 #   stage: test
 #   needs:
 #     - build_exatrkx
-#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:52
+#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
 #   tags:
 #     - docker-gpu-nvidia
 #   script:
@@ -136,7 +136,7 @@ build_exatrkx:
 #   stage: test
 #   needs:
 #     - build_exatrkx
-#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:52
+#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
 #   tags:
 #     - docker-gpu-nvidia
 #   script:
@@ -152,7 +152,7 @@ build_exatrkx:
 
 build_linux_ubuntu:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2404:53
+  image: ghcr.io/acts-project/ubuntu2404:58
 
   cache:
     key: ccache-${CI_JOB_NAME_SLUG}-${HEAD_REF}-${CCACHE_KEY_SUFFIX}
@@ -186,12 +186,12 @@ build_linux_ubuntu:
       -DACTS_BUILD_PLUGIN_ONNX=ON
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
 linux_test_examples:
   stage: test
-  image: ghcr.io/acts-project/ubuntu2404:53
+  image: ghcr.io/acts-project/ubuntu2404:58
   needs: [build_linux_ubuntu]
 
   script:
@@ -212,7 +212,7 @@ linux_test_examples:
 
 linux_physmon:
   stage: test
-  image: ghcr.io/acts-project/ubuntu2404:53
+  image: ghcr.io/acts-project/ubuntu2404:58
   needs: [build_linux_ubuntu]
 
   artifacts:
@@ -232,7 +232,7 @@ linux_physmon:
     - cd ..
 
     - git config --global safe.directory "$GITHUB_WORKSPACE"
-    - pip3 install histcmp==0.6.6 matplotlib
+    - pip3 install histcmp==0.6.7 matplotlib
     - pip3 install -r src/Examples/Scripts/requirements.txt
     - /usr/local/bin/geant4-config --install-datasets
     - source build/this_acts_withdeps.sh
@@ -271,7 +271,7 @@ linux_physmon:
       -DCMAKE_CXX_STANDARD=${CXXSTD}
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
     - ctest --test-dir build -j$(nproc)
@@ -299,21 +299,21 @@ linux_ubuntu_2404:
   <<: *linux_ubuntu_extra
   variables:
     CXXSTD: 20
-  image: ghcr.io/acts-project/ubuntu2404:53
+  image: ghcr.io/acts-project/ubuntu2404:58
 
 linux_ubuntu_2204_clang:
   <<: *linux_ubuntu_extra
   variables:
     CXXSTD: 20
-  image: ghcr.io/acts-project/ubuntu2204_clang:52
+  image: ghcr.io/acts-project/ubuntu2204_clang:58
 
 
 ######################
 ### LCG JOB MATRIX ###
 ######################
 
 .lcg: &lcg_base_job
-  image: ghcr.io/acts-project/${OS}-base:53
+  image: ghcr.io/acts-project/${OS}-base:58
   stage: build
   tags:
     - cvmfs
@@ -364,27 +364,15 @@ linux_ubuntu_2204_clang:
       cmake -B build -S src
       --preset=gitlab-ci
       -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
+      -DACTS_BUILD_PLUGIN_GEOMODEL=OFF # GeoModel is not in LCG at this point
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
     - ctest --test-dir build -j$(nproc)
 
 
-lcg_104:
-  <<: *lcg_base_job
-
-  variables:
-    LCG_VERSION: "104"
-
-  parallel:
-    matrix:
-      - OS: [alma9]
-        COMPILER:
-          - gcc13
-          - clang16
-
 lcg_105:
   <<: *lcg_base_job
 

.merge-sentinel.yml

@@ -14,6 +14,7 @@ rules:
     required_checks:
      - Docs / docs
      - Analysis / build_debug
+     - SonarCloud Code Analysis
 
     required_pattern:
      - "Builds / *"