From b6dad447bd84f3a54b05be57cc2f1e9516b031cf Mon Sep 17 00:00:00 2001 From: tmadlener Date: Tue, 7 May 2024 10:45:47 +0200 Subject: [PATCH 1/2] CI: Update LCG stacks and OSs for linux workflows --- .github/workflows/test.yml | 10 +++++----- .github/workflows/ubuntu.yml | 17 ++++++++--------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c98366d82..3ff6ea1b6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,11 +20,11 @@ jobs: include: - LCG: "dev4/x86_64-el9-gcc13-opt" CXX_STANDARD: 20 - - LCG: "LCG_102/x86_64-centos7-clang12-opt" - RNTUPLE: OFF + - LCG: "LCG_105/x86_64-el9-clang16-opt" + RNTUPLE: ON CXX_STANDARD: 17 - - LCG: "LCG_102/x86_64-centos8-gcc11-opt" - RNTUPLE: OFF + - LCG: "LCG_105/x86_64-el9-gcc13-opt" + RNTUPLE: ON CXX_STANDARD: 17 steps: - uses: actions/checkout@v4 @@ -57,4 +57,4 @@ jobs: echo "::endgroup::" echo "::group::Install" ninja install - echo "::endgroup::" \ No newline at end of file + echo "::endgroup::" diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 07cad5e64..9b3f0fe03 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -13,9 +13,8 @@ jobs: strategy: fail-fast: false matrix: - sio: [ON] - LCG: ["dev3/x86_64-ubuntu2004-gcc9-opt", - "dev4/x86_64-ubuntu2004-gcc9-opt"] + LCG: ["dev3/x86_64-ubuntu2204-gcc11-opt", + "dev4/x86_64-ubuntu2204-gcc11-opt"] steps: - uses: actions/checkout@v4 - uses: cvmfs-contrib/github-action-cvmfs@v4 @@ -26,15 +25,15 @@ jobs: echo "::group::Run CMake" mkdir build install cd build - cmake -DENABLE_SIO=${{ matrix.sio }} \ + cmake -DENABLE_SIO=ON \ -DENABLE_JULIA=ON \ -DCMAKE_INSTALL_PREFIX=../install \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror -Wno-error=deprecated-declarations " \ - -DUSE_EXTERNAL_CATCH2=OFF \ - -DPODIO_SET_RPATH=ON \ - -DENABLE_RNTUPLE=ON \ - -G Ninja .. + -DUSE_EXTERNAL_CATCH2=OFF \ + -DPODIO_SET_RPATH=ON \ + -DENABLE_RNTUPLE=ON \ + -G Ninja .. echo "::endgroup::" echo "::group::Build" ninja -k0 @@ -47,4 +46,4 @@ jobs: echo "::endgroup::" echo "::group::Install" ninja install - echo "::endgroup::" \ No newline at end of file + echo "::endgroup::" From 4eb3e9406e4bd0ffd41369e47252be4942cc7be2 Mon Sep 17 00:00:00 2001 From: tmadlener Date: Tue, 7 May 2024 11:00:00 +0200 Subject: [PATCH 2/2] Simplify setup for linux based tests --- .github/workflows/test.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ff6ea1b6..ec62e79fe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,18 +14,10 @@ jobs: fail-fast: false matrix: LCG: ["dev3/x86_64-el9-clang16-opt", - "dev4/x86_64-el9-clang16-opt"] - CXX_STANDARD: [20] - RNTUPLE: [ON] - include: - - LCG: "dev4/x86_64-el9-gcc13-opt" - CXX_STANDARD: 20 - - LCG: "LCG_105/x86_64-el9-clang16-opt" - RNTUPLE: ON - CXX_STANDARD: 17 - - LCG: "LCG_105/x86_64-el9-gcc13-opt" - RNTUPLE: ON - CXX_STANDARD: 17 + "dev4/x86_64-el9-clang16-opt", + "dev4/x86_64-el9-gcc13-opt", + "LCG_105/x86_64-el9-clang16-opt", + "LCG_105/x86_64-el9-gcc13-opt"] steps: - uses: actions/checkout@v4 - uses: cvmfs-contrib/github-action-cvmfs@v4 @@ -38,9 +30,9 @@ jobs: cd build cmake -DENABLE_SIO=ON \ -DENABLE_JULIA=ON \ - -DENABLE_RNTUPLE=${{ matrix.RNTUPLE }} \ + -DENABLE_RNTUPLE=ON \ -DCMAKE_INSTALL_PREFIX=../install \ - -DCMAKE_CXX_STANDARD=${{ matrix.CXX_STANDARD }} \ + -DCMAKE_CXX_STANDARD=20 \ -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror -Wno-error=deprecated-declarations " \ -DUSE_EXTERNAL_CATCH2=OFF \ -DPODIO_USE_CLANG_FORMAT=AUTO \