From 0628211104993ba886e89e788b12e072e3b63b55 Mon Sep 17 00:00:00 2001
From: tmadlener <thomas.madlener@desy.de>
Date: Mon, 4 Dec 2023 12:24:26 +0100
Subject: [PATCH 1/2] Switch to run-lcg-view action for CI

---
 .github/scripts/compile_and_test.sh | 11 -----------
 .github/workflows/linux.yml         | 27 +++++++++++++++++++--------
 2 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100755 .github/scripts/compile_and_test.sh

diff --git a/.github/scripts/compile_and_test.sh b/.github/scripts/compile_and_test.sh
deleted file mode 100755
index 7228b0a1..00000000
--- a/.github/scripts/compile_and_test.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-source /cvmfs/sft.cern.ch/lcg/views/${VIEW}/setup.sh
-
-cd /Package
-mkdir build install
-cd build
-cmake -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_CXX_STANDARD=${STANDARD} -DSIO_BUILTIN_ZLIB=${BUILTIN_ZLIB} -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " -G Ninja .. && \
-ninja -k0 && \
-ninja install && \
-ctest --output-on-failure
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index bb5d19d2..9ecc2808 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -10,14 +10,25 @@ jobs:
       matrix:
         LCG: ["LCG_97a/x86_64-centos7-gcc9-opt"]
         BUILTIN_ZLIB: ["ON", "OFF"]
-    env:
-      STANDARD: 17
     steps:
     - uses: actions/checkout@v2
     - uses: cvmfs-contrib/github-action-cvmfs@v2
-    - name: Start container
-      run: |
-        docker run -it --privileged --name CI_container -v /home/runner/work/SIO/SIO:/Package -v /cvmfs:/cvmfs:shared -e VIEW=${{ matrix.LCG }} -e BUILTIN_ZLIB=${{ matrix.BUILTIN_ZLIB }} -e STANDARD=${STANDARD} -d ghcr.io/aidasoft/centos7:latest /bin/bash
-    - name: Compile and test
-      run: |
-        docker exec CI_container /bin/bash -c "./Package/.github/scripts/compile_and_test.sh"
+    - uses: aidasoft/run-lcg-view@v4
+      with:
+        release-platform: ${{ matrix.LCG }}
+        run: |
+          echo "::group::Run CMake"
+          mkdir build
+          cd build
+          cmake -DCMAKE_INSTALL_PREFIX=../install \
+                -DCMAKE_CXX_STANDARD=17 \
+                -DSIO_BUILTIN_ZLIB=${{ matrix.BUILTIN_ZLIB }} \
+                -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " \
+                -G Ninja \
+                ..
+          echo "::endgroup::" && echo "::group::Build"
+          ninja -k0
+          echo "::endgroup::" && echo "::group::Test"
+          ctest --output-on-failure
+          echo "::endgroup::" && echo "::group::Install"
+          ninja install

From 2e2564fe49e4d6ed4920117cee2fad66337e1313 Mon Sep 17 00:00:00 2001
From: tmadlener <thomas.madlener@desy.de>
Date: Mon, 4 Dec 2023 12:25:50 +0100
Subject: [PATCH 2/2] Switch to LCG_104 for CI and fail on warnings

---
 .github/workflows/linux.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 9ecc2808..e8f402b5 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -8,7 +8,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        LCG: ["LCG_97a/x86_64-centos7-gcc9-opt"]
+        LCG: ["LCG_104/x86_64-el9-clang16-opt",
+              "LCG_104/x86_64-el9-gcc13-opt"]
         BUILTIN_ZLIB: ["ON", "OFF"]
     steps:
     - uses: actions/checkout@v2
@@ -23,7 +24,7 @@ jobs:
           cmake -DCMAKE_INSTALL_PREFIX=../install \
                 -DCMAKE_CXX_STANDARD=17 \
                 -DSIO_BUILTIN_ZLIB=${{ matrix.BUILTIN_ZLIB }} \
-                -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " \
+                -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror" \
                 -G Ninja \
                 ..
           echo "::endgroup::" && echo "::group::Build"