From 04d32d60cfe645a7896e9bed114f558e2ce1b47e Mon Sep 17 00:00:00 2001
From: Thomas Madlener <thomas.madlener@desy.de>
Date: Tue, 7 May 2024 14:24:35 +0200
Subject: [PATCH] CI: Update LCG stacks and OSs for linux workflows (#597)

* CI: Update LCG stacks and OSs for linux workflows

* Simplify setup for linux based tests
---
 .github/workflows/test.yml   | 22 +++++++---------------
 .github/workflows/ubuntu.yml | 17 ++++++++---------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c98366d82..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_102/x86_64-centos7-clang12-opt"
-            RNTUPLE: OFF
-            CXX_STANDARD: 17
-          - LCG: "LCG_102/x86_64-centos8-gcc11-opt"
-            RNTUPLE: OFF
-            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 \
@@ -57,4 +49,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::"