From 6754d944113a49e85ff724f9512eae9e0cd8b634 Mon Sep 17 00:00:00 2001 From: tmadlener Date: Wed, 28 Aug 2024 10:12:44 +0200 Subject: [PATCH 1/3] Make sure to build EDM4hep with c++20 --- .github/workflows/edm4hep.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/edm4hep.yaml b/.github/workflows/edm4hep.yaml index 92982dcde..a3bdb0bd0 100644 --- a/.github/workflows/edm4hep.yaml +++ b/.github/workflows/edm4hep.yaml @@ -48,7 +48,7 @@ jobs: cmake -DENABLE_SIO=ON \ -DENABLE_JULIA=ON \ -DCMAKE_INSTALL_PREFIX=../install \ - -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_CXX_STANDARD=20 \ -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror -Wno-error=deprecated-declarations " \ -DUSE_EXTERNAL_CATCH2=ON \ -DBUILD_TESTING=OFF\ @@ -64,7 +64,7 @@ jobs: echo "::group::Build and test EDM4hep" cd $STARTDIR/edm4hep mkdir build && cd build - cmake -DCMAKE_CXX_STANDARD=17 \ + cmake -DCMAKE_CXX_STANDARD=20 \ -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " \ -DUSE_EXTERNAL_CATCH2=ON \ -G Ninja .. From 882b855e842871380d08573ee7614ac8c636d6c6 Mon Sep 17 00:00:00 2001 From: tmadlener Date: Wed, 28 Aug 2024 10:23:35 +0200 Subject: [PATCH 2/3] Switch LCG views to be able to build with c++20 --- .github/workflows/edm4hep.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/edm4hep.yaml b/.github/workflows/edm4hep.yaml index a3bdb0bd0..7b69ea4b3 100644 --- a/.github/workflows/edm4hep.yaml +++ b/.github/workflows/edm4hep.yaml @@ -14,8 +14,8 @@ jobs: fail-fast: false matrix: LCG: ["LCG_104/x86_64-el9-gcc13-opt", - "dev4/x86_64-ubuntu2004-gcc9-opt", - "LCG_104/x86_64-el9-clang16-opt"] + "dev4/x86_64-el9-gcc14-opt", + "LCG_106/x86_64-el9-clang16-opt"] steps: - uses: actions/checkout@v4 with: From 56b5c67b3e95a4c9a7afa53e3bb8afbc47778aae Mon Sep 17 00:00:00 2001 From: Thomas Madlener Date: Wed, 28 Aug 2024 10:33:06 +0200 Subject: [PATCH 3/3] Don't use a non-existant LCG release --- .github/workflows/edm4hep.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/edm4hep.yaml b/.github/workflows/edm4hep.yaml index 7b69ea4b3..eb94be63d 100644 --- a/.github/workflows/edm4hep.yaml +++ b/.github/workflows/edm4hep.yaml @@ -15,7 +15,7 @@ jobs: matrix: LCG: ["LCG_104/x86_64-el9-gcc13-opt", "dev4/x86_64-el9-gcc14-opt", - "LCG_106/x86_64-el9-clang16-opt"] + "LCG_104/x86_64-el9-clang16-opt"] steps: - uses: actions/checkout@v4 with: