Merge branch 'main' into chore-use-ranges-find

Author: asalzburger

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/acts-project/spack-container:12.0.0_linux-ubuntu24.04_gcc-13.3.0
+FROM ghcr.io/acts-project/spack-container:18.0.0_linux-ubuntu24.04_gcc-13.3.0
 
 RUN apt-get update && apt-get install -y clangd vim
 

.devcontainer/devcontainer.json

@@ -1,25 +1,25 @@
 {
-	"name": "Ubuntu 24.04",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"xaver.clang-format",
-				"twxs.cmake",
-				"llvm-vs-code-extensions.vscode-clangd",
-			],
-			"settings": {
-				"clangd.path": "/usr/bin/clangd",
-				"clangd.arguments": [
-					"--compile-commands-dir=${containerWorkspaceFolder}/build_devcontainer"
-				]
-			}
-		}
-	},
-	"containerEnv": {
-		"CXXFLAGS": "-Wno-psabi"
-	},
-	"postCreateCommand": "bash .devcontainer/setup.sh ${containerWorkspaceFolder}"
+    "name": "Ubuntu 24.04",
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "xaver.clang-format",
+                "twxs.cmake",
+                "llvm-vs-code-extensions.vscode-clangd"
+            ],
+            "settings": {
+                "clangd.path": "/usr/bin/clangd",
+                "clangd.arguments": [
+                    "--compile-commands-dir=${containerWorkspaceFolder}/build_devcontainer"
+                ]
+            }
+        }
+    },
+    "containerEnv": {
+        "CXXFLAGS": "-Wno-psabi"
+    },
+    "postCreateCommand": "bash .devcontainer/setup.sh ${containerWorkspaceFolder}"
 }

.github/actions/dependencies/action.yml

@@ -13,20 +13,32 @@ inputs:
   spack_version:
     description: 'Version of Spack to use'
     required: false
-    default: 'v1.0.0'
+    default: 'v1.0.2'
   spack_repo_version:
     description: 'Version of Spack builtin repo to use'
     required: false
     default: 'v2025.07.0'
   DEPENDENCY_TAG:
     description: 'Dependency tag to pull from'
     required: false
-    default: 'v13.0.0'
+    default: 'v18.0.0'
+  full_install:
+    description: 'Whether to do a full dependency installation including Geant4 datasets and Python packages'
+    required: false
+    default: 'false'
 
 
 runs:
   using: 'composite'
   steps:
+    - name: Setup Python version
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.12"
+
+    - name: Install the latest version of uv
+      uses: astral-sh/setup-uv@v6
+
     - name: Prerequisites
       if: startsWith(runner.os, 'macos')
       shell: bash
@@ -38,7 +50,7 @@ runs:
       uses: actions/cache/restore@v4
       with:
         path: spack_cache
-        key: spack-r2-${{ inputs.spack_version }}-${{ inputs.spack_repo_version }}-${{ hashFiles('CI/dependencies/setup_spack.sh') }}
+        key: spack-r4-${{ inputs.spack_version }}-${{ inputs.spack_repo_version }}-${{ hashFiles('CI/dependencies/setup_spack.sh') }}
 
     - name: Extract cached Spack
       if: steps.cache-restore.outputs.cache-hit == 'true'
@@ -75,10 +87,14 @@ runs:
         SPACK_REPO_VERSION: ${{ inputs.spack_repo_version }}
         DEPENDENCY_TAG: ${{ inputs.DEPENDENCY_TAG }}
       run: |
+        args=""
+        if [ "${{ inputs.full_install }}" == "true" ]; then
+          echo "Full install"
+          args="${args} -f"
+        fi
         if [ -n "${{ inputs.compiler }}" ]; then
           echo "With compiler"
-          CI/dependencies/setup.sh -c "${{ inputs.compiler }}"
-        else
-          echo "Without compiler"
-          CI/dependencies/setup.sh
+          args="${args} -c ${{ inputs.compiler }}"
         fi
+
+        CI/dependencies/setup.sh $args

.github/workflows/analysis.yml

@@ -22,18 +22,18 @@ env:
   CCACHE_MAXSIZE: 1.25G
   CCACHE_KEY_SUFFIX: r2
   ACTS_LOG_FAILURE_THRESHOLD: WARNING
-  DEPENDENCY_TAG: v11.1.0
+  DEPENDENCY_TAG: v17.0.0
 
 # NOTE this only builds core unittests to reduce the output size. if we
 #      found a way to have Github actions not fail regularly with this job
 #      all unit tests should be reactivated.
 jobs:
   build_debug:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:80
+    container: ghcr.io/acts-project/ubuntu2404:83
     steps:
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Install dependencies
         uses: ./.github/actions/dependencies
@@ -52,11 +52,7 @@ jobs:
       - name: Configure
         run: >
           ccache -z &&
-          cmake -B build -S .
-          --preset=github-ci
-          -DCMAKE_BUILD_TYPE=Debug
-          -DCMAKE_CXX_FLAGS="-Werror --coverage -g -gz -g1"
-          -DACTS_BUILD_ODD=OFF
+          cmake -B build -S . --preset=github-ci-coverage
       - name: Build
         run: cmake --build build
       - name: ccache stats
@@ -75,7 +71,7 @@ jobs:
           && cd build
           && /usr/bin/python3 ../CI/test_coverage.py
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: coverage-build
           path: build
@@ -86,17 +82,17 @@ jobs:
 
       - name: Persist PR number
         if: github.event_name == 'pull_request'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: PR_NUMBER
           path: PR_NUMBER.txt
 
   build_performance:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:80
+    container: ghcr.io/acts-project/ubuntu2404:83
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Install dependencies
         uses: ./.github/actions/dependencies
@@ -118,7 +114,7 @@ jobs:
         run: cmakeperf collect build/compile_commands.json -o perf.csv
       - name: Results
         run: cmakeperf print perf.csv
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: cmakeperf
           path: perf.csv
@@ -128,7 +124,7 @@ jobs:
   #   needs: build_performance
   #   if: github.ref == 'refs/heads/main'
   #   steps:
-  #     - uses: actions/checkout@v5
+  #     - uses: actions/checkout@v6
   #     - name: Install dependencies
   #       run: pip3 install git+https://github.com/paulgessinger/headwind.git@eeeaa80
   #     - uses: actions/download-artifact@v4