Skip to content

Commit

Permalink
ci: Drop LCG 104 job (DD4hep too old for current ODD) (#3512)
Browse files Browse the repository at this point in the history
Drop LCG 104. LCG 106 ships with Boost 1.85.0 which has a known UB issue (boostorg/container#273) that causes the vertexing to fail.
  • Loading branch information
paulgessinger authored Aug 19, 2024
1 parent d3df140 commit 972f594
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
13 changes: 0 additions & 13 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -373,19 +373,6 @@ linux_ubuntu_2204_clang:
- 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

Expand Down
11 changes: 11 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,17 @@ if(ACTS_SETUP_BOOST)
"Found Boost ${Boost_VERSION} - recommended is at least ${_acts_boost_recommended_version}"
)
endif()

if(Boost_VERSION VERSION_EQUAL "1.85.0")
set(message
"Boost 1.85.0 is known to be broken (https://github.com/boostorg/container/issues/273). Please use a different version."
)
if(ACTS_IGNORE_BOOST_1850_ERROR)
message(WARNING ${message})
else()
message(SEND_ERROR ${message})
endif()
endif()
endif()

if(ACTS_SETUP_EIGEN3)
Expand Down
6 changes: 4 additions & 2 deletions Plugins/Podio/include/Acts/Plugins/Podio/PodioUtil.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@

#include <podio/podioVersion.h>

#if podio_VERSION_MAJOR >= 1
#if podio_VERSION_MAJOR >= 1 || \
(podio_VERSION_MAJOR == 0 && podio_VERSION_MINOR == 99)
#include <podio/ROOTReader.h>
#include <podio/ROOTWriter.h>
#else
Expand All @@ -41,7 +42,8 @@ namespace PodioUtil {
// We want to support podio 0.16 and 1.x for now

// See https://github.com/AIDASoft/podio/pull/549
#if podio_VERSION_MAJOR >= 1
#if podio_VERSION_MAJOR >= 1 || \
(podio_VERSION_MAJOR == 0 && podio_VERSION_MINOR == 99)
using ROOTWriter = podio::ROOTWriter;
using ROOTReader = podio::ROOTReader;
#else
Expand Down

0 comments on commit 972f594

Please sign in to comment.