Update to Ubuntu 26.04 and ROOT 6.38.04

.github/workflows/ci.yml

@@ -64,8 +64,6 @@ jobs:
         uses: docker/build-push-action@v7
         with:
           context: .
-          cache-from: type=registry,ref=ldmx/dev:build-cache-${{ matrix.platform }}
-          cache-to: type=registry,ref=ldmx/dev:build-cache-${{ matrix.platform }},mode=max
           platforms: linux/${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
           outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true

Dockerfile

@@ -1,6 +1,6 @@
-FROM ubuntu:24.04
+FROM ubuntu:26.04
 LABEL maintainer="Tom Eichlersmith <eichl008@umn.edu>, Tamas Almos Vami <Tamas.Almos.Vami@cern.ch>"
-LABEL ubuntu.version="24.04"
+LABEL ubuntu.version="26.04"
 
 ARG NPROC=1
 
@@ -22,6 +22,7 @@ RUN install-ubuntu-packages \
     ccache \
     cmake \
     gcc g++ gfortran \
+    gcc-13 g++-13 \
     libcurl4-openssl-dev \
     locales \
     make \
@@ -119,7 +120,6 @@ RUN mkdir src && \
 
 RUN install-ubuntu-packages \
     fonts-freefont-ttf \
-    libafterimage-dev \
     libfftw3-dev \
     libfreetype6-dev \
     libftgl-dev \
@@ -141,17 +141,17 @@ RUN install-ubuntu-packages \
     libz-dev \
     libzstd-dev \
     nlohmann-json3-dev \
-    srm-ifce-dev \
-    libgsl-dev
+    libgsl-dev \
+    libcrypt-dev
 
-ENV ROOT_VERSION="6.34.10"
+ENV ROOT_VERSION="6.38.04"
 LABEL root.version=${ROOT_VERSION}
 RUN mkdir src &&\
     ${__wget} https://root.cern/download/root_v${ROOT_VERSION}.source.tar.gz |\
      ${__untar} &&\
     cmake \
       -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_CXX_STANDARD=20 \
+      -DCMAKE_CXX_STANDARD=23 \
       -DCMAKE_INSTALL_PREFIX=${__prefix} \
       -DCMAKE_INSTALL_LIBDIR=lib \
       -Dgnuinstall=ON \
@@ -162,8 +162,8 @@ RUN mkdir src &&\
       -Dopengl=ON \
       -Dpyroot=ON \
       -Dxrootd=OFF \
-      -Dmathmore=ON \   
-      -Dpythia8=ON \    
+      -Dmathmore=ON \
+      -Dpythia8=ON \
       -B build \
       -S src \
     && cmake --build build --target install -j$NPROC &&\
@@ -199,7 +199,11 @@ RUN __owner="geant4" &&\
         -DGEANT4_USE_GDML=ON \
         -DGEANT4_INSTALL_EXAMPLES=OFF \
         -DGEANT4_USE_OPENGL_X11=ON \
+        -DGEANT4_USE_SYSTEM_ZLIB=ON \
         -DCMAKE_INSTALL_PREFIX=${__prefix} \
+        -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+        -DCMAKE_C_COMPILER=gcc-13 \
+        -DCMAKE_CXX_COMPILER=g++-13 \
         -B src/build \
         -S src \
         &&\
@@ -259,7 +263,8 @@ RUN mkdir src &&\
       -DHEPMC3_BUILD_STATIC_LIBS:BOOL=ON \
       -DHEPMC3_BUILD_DOCS:BOOL=OFF \
       -DHEPMC3_ENABLE_PYTHON:BOOL=ON \
-      -DHEPMC3_PYTHON_VERSIONS=3.10 \
+      -DHEPMC3_PYTHON_VERSIONS=3.14 \
+      -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
       -B src/build \
       -S src \
     &&\
@@ -399,6 +404,7 @@ RUN install-ubuntu-packages \
     ca-certificates \
     clang-format \
     libboost-all-dev \
+    libcurl4-openssl-dev \
     libssl-dev
 
 ###############################################################################

README.md

@@ -37,16 +37,16 @@ which provides support for Docker, Podman, and Apptainer.
 
 Software Package | Version | Construction Process
 ---|---|---
-[Ubuntu Server](https://ubuntu.com/) | 24.04 | Base Image
-[GCC](https://gcc.gnu.org/) | 13.3.0 | From Ubuntu Repos
-[Python](https://www.python.org/) | 3.12.3 | From Ubuntu Repos
-[cmake](https://cmake.org/) | 3.28.3 | From Ubuntu Repos
-[Boost](https://www.boost.org/doc/libs/1_83_0/) | 1.83.0 | From Ubuntu Repos
+[Ubuntu Server](https://ubuntu.com/) | 26.04 | Base Image
+[GCC](https://gcc.gnu.org/) | 15.2.0 | From Ubuntu Repos
+[Python](https://www.python.org/) | 3.14.4 | From Ubuntu Repos
+[cmake](https://cmake.org/) | 4.3.2 | From Ubuntu Repos
+[Boost](https://www.boost.org/doc/libs/1_90_0/) | 1.9.0 | From Ubuntu Repos
 [XercesC](http://xerces.apache.org/xerces-c/) | 3.3.0 | Built from source
 [LHAPDF](https://www.lhapdf.org/) | 6.5.5 | Built from source
 [Pythia8](https://pythia.org/) | 8.313 | Built from source
 [nlohmann/json](https://json.nlohmann.me/) | 3.11.3 | From Ubuntu Repos
-[ROOT](https://root.cern.ch/) | 6.34.10 | Built from source
+[ROOT](https://root.cern.ch/) | 6.38.04 | Built from source
 [Geant4](https://geant4.web.cern.ch/) | [LDMX.10.2.3\_v0.6](https://github.com/LDMX-Software/geant4/tree/LDMX.10.2.3_v0.6) | Built from source
 [Eigen](https://eigen.tuxfamily.org) | 3.4.0 | Built from source
 [HEPMC3](https://hepmc.web.cern.ch) | 3.3.0 | Built from source
@@ -55,7 +55,7 @@ Software Package | Version | Construction Process
 [Catch2](https://github.com/catchorg/Catch2) | 3.8.0 | Built from source
 [Acts](https://acts.readthedocs.io/en/v36.0.0/) | 36.0.0 | Built from source
 [ONNX Runtime](https://github.com/microsoft/onnxruntime) | 1.15.0 | Download pre-built binaries
-[Clang](https://clang.llvm.org/) | 18.1.3 | From Ubuntu Repos
+[Clang](https://clang.llvm.org/) | 21.1.8 | From Ubuntu Repos
 
 More detailed documentation of the available software is online.
 - [Ubuntu Packages](https://ldmx-software.github.io/dev-build-context/ubuntu-packages.html)

ci/interop/v3.3.0.patch

@@ -5,9 +5,71 @@ index e418c42..79ed3a3 100644
 +++ b/Conditions/include/Conditions/SimpleTableCondition.h
 @@ -7,6 +7,7 @@
  #define FRAMEWORK_SIMPLETABLECONDITION_H_
- 
+
  #include <vector>
 +#include <cstdint>
- 
+
  #include "Framework/ConditionsObject.h"
  #include "Framework/Exception/Exception.h"
+diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt
+--- a/DetDescr/CMakeLists.txt
++++ b/DetDescr/CMakeLists.txt
+@@ -17,32 +17,27 @@
+ option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)
+ if(BUILD_DETECTORID_BINDINGS)
++  cmake_policy(SET CMP0167 NEW)
+   find_package(Python COMPONENTS Development)
+
+-  message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
+-  find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++  message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
++  find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
+   # libboost_python3 style libraries
+   if (NOT Boost_FOUND)
+-      message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")
+-      find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})
++      message("Looking for libboost_python${Python_VERSION_MAJOR}")
++      find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})
+   endif()
+
+-  # libboost_python style libraries
+-  if (NOT Boost_FOUND)
+-      message("Looking for libboost_python")
+-      find_package(Boost QUIET COMPONENTS system thread python)
+-  endif()
+-
+   # libboost_python-py36 style libraries
+   if (NOT Boost_FOUND)
+-      message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
+-      find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++      message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
++      find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
+   endif()
+
+   # libboost_python3-py36 style libraries
+   if (NOT Boost_FOUND)
+-      message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
+-      find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++      message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
++      find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
+   endif()
+
+   # Nothing worked
+   if (NOT Boost_FOUND)
+diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt
+--- a/Framework/CMakeLists.txt
++++ b/Framework/CMakeLists.txt
+@@ -16,11 +16,11 @@
+ # Search for the Python3 library
+ find_package(Python3 COMPONENTS Interpreter Development)
+
++cmake_policy(SET CMP0167 NEW)
+ # Search for Boost
+ find_package(
+   Boost REQUIRED
+-  COMPONENTS system
+-             log
++  COMPONENTS log
+              filesystem
+              thread
+              chrono

ci/interop/v3.4.0.patch

@@ -4,10 +4,72 @@ index 467d8b9..632de04 100644
 --- a/Conditions/include/Conditions/SimpleTableCondition.h
 +++ b/Conditions/include/Conditions/SimpleTableCondition.h
 @@ -8,6 +8,7 @@
- 
+
  #include <vector>
  #include <ostream>
 +#include <cstdint>
- 
+
  #include "Framework/ConditionsObject.h"
  #include "Framework/Exception/Exception.h"
+diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt
+--- a/DetDescr/CMakeLists.txt
++++ b/DetDescr/CMakeLists.txt
+@@ -17,32 +17,27 @@
+ option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)
+ if(BUILD_DETECTORID_BINDINGS)
++  cmake_policy(SET CMP0167 NEW)
+   find_package(Python COMPONENTS Development)
+
+-  message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
+-  find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++  message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
++  find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
+   # libboost_python3 style libraries
+   if (NOT Boost_FOUND)
+-      message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")
+-      find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})
++      message("Looking for libboost_python${Python_VERSION_MAJOR}")
++      find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})
+   endif()
+
+-  # libboost_python style libraries
+-  if (NOT Boost_FOUND)
+-      message("Looking for libboost_python")
+-      find_package(Boost QUIET COMPONENTS system thread python)
+-  endif()
+-
+   # libboost_python-py36 style libraries
+   if (NOT Boost_FOUND)
+-      message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
+-      find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++      message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
++      find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
+   endif()
+
+   # libboost_python3-py36 style libraries
+   if (NOT Boost_FOUND)
+-      message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
+-      find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++      message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
++      find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
+   endif()
+
+   # Nothing worked
+   if (NOT Boost_FOUND)
+diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt
+--- a/Framework/CMakeLists.txt
++++ b/Framework/CMakeLists.txt
+@@ -23,11 +23,11 @@
+ # Search for the Python3 library
+ find_package(Python3 COMPONENTS Interpreter Development)
+
++cmake_policy(SET CMP0167 NEW)
+ # Search for Boost
+ find_package(
+   Boost REQUIRED
+-  COMPONENTS system
+-             log
++  COMPONENTS log
+              filesystem
+              thread
+              chrono

ci/interop/v4.0.5.patch

@@ -10,3 +10,76 @@ index d34d930d..b69f81c7 100644
 
  #include "Framework/ConditionsObject.h"
  #include "Framework/Exception/Exception.h"
+diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt
+--- a/DetDescr/CMakeLists.txt
++++ b/DetDescr/CMakeLists.txt
+@@ -17,32 +17,27 @@
+ option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)
+ if(BUILD_DETECTORID_BINDINGS)
++  cmake_policy(SET CMP0167 NEW)
+   find_package(Python COMPONENTS Development)
+
+-  message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
+-  find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++  message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
++  find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
+   # libboost_python3 style libraries
+   if (NOT Boost_FOUND)
+-      message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")
+-      find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})
++      message("Looking for libboost_python${Python_VERSION_MAJOR}")
++      find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})
+   endif()
+
+-  # libboost_python style libraries
+-  if (NOT Boost_FOUND)
+-      message("Looking for libboost_python")
+-      find_package(Boost QUIET COMPONENTS system thread python)
+-  endif()
+-
+   # libboost_python-py36 style libraries
+   if (NOT Boost_FOUND)
+-      message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
+-      find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++      message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
++      find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
+   endif()
+
+   # libboost_python3-py36 style libraries
+   if (NOT Boost_FOUND)
+-      message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
+-      find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++      message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
++      find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
+   endif()
+
+   # Nothing worked
+   if (NOT Boost_FOUND)
+diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt
+--- a/Framework/CMakeLists.txt
++++ b/Framework/CMakeLists.txt
+@@ -23,11 +23,11 @@
+ # Search for the Python3 library
+ find_package(Python3 COMPONENTS Interpreter Development)
+
++cmake_policy(SET CMP0167 NEW)
+ # Search for Boost
+ find_package(
+   Boost REQUIRED
+-  COMPONENTS system
+-             log
++  COMPONENTS log
+              filesystem
+              thread
+              chrono
+diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx
+--- a/Hcal/src/Hcal/HcalClusterProducer.cxx
++++ b/Hcal/src/Hcal/HcalClusterProducer.cxx
+@@ -2,6 +2,7 @@
+
+ #include <exception>
+ #include <iostream>
++#include <list>
+
+ #include "Hcal/MyClusterWeight.h"
+ #include "Hcal/TemplatedClusterFinder.h"